Merge pull request #16 from hilaryp/dev

Hilary's commits

FAVE-extract/bin/extractFormants.py

@@ -882,6 +882,7 @@ def getSpeakerBackground(speakername, speakernum):
     speaker.ethnicity = raw_input("Ethnicity:\t\t")
     speaker.location = raw_input("Location:\t\t")
     speaker.year = raw_input("Year of recording:\t")
+    speaker.years_of_schooling = raw_input("Years of schooling:\t")
     speaker.tiernum = speakernum * \
         2  # tiernum points to phone tier = first tier for given speaker
 

README.md

@@ -1,21 +1,21 @@
 # FAVE toolkits
 
-This is a repository for the FAVE-Align and FAVE-extract tooklits.
-The first commit here represents the toolkit as it was available on the FAVE website as of November 21, 2013.
+This is a repository for the FAVE-Align and FAVE-extract toolkits.
+The first commit here represents the toolkit as it was available on the FAVE website as of October 21, 2013.
 The extractFormants code in the JoFrhwld/FAAV repository represents an earlier version of the code.
 
 ## FAVE website
 
-The interactive website for utilizing fave can be found at [fave.ling.upenn.edu](http://fave.ling.upenn.edu/)
+The interactive website for utilizing FAVE can be found at [fave.ling.upenn.edu](http://fave.ling.upenn.edu/)
 
 ## Support
 
 You can find user support for installing and using the FAVE toolkits at the [FAVE Users' Group](https://groups.google.com/forum/#!forum/fave-users).
 
 ## Contributing to FAVE
-For the most part, we'll be utlizing the fork-and-pull paradigm (see [Using Pull Requests](https://help.github.com/articles/using-pull-requests)). Please send pull requests to the `dev` branch.
+For the most part, we'll be utilizing the fork-and-pull paradigm (see [Using Pull Requests](https://help.github.com/articles/using-pull-requests)). Please send pull requests to the `dev` branch.
 
-## Attribition
+## Attribution
 We ask that if you use the online interface, or the code available in this repository, that you cite:
 
 Rosenfelder, Ingrid; Fruehwald, Josef; Evanini, Keelan and Jiahong Yuan. 2011. FAVE (Forced Alignment and Vowel Extraction) Program Suite. http://fave.ling.upenn.edu.