Merge pull request #141 from timwindsor/master

Adds UCOSP contributors for Fall 2014
Merge pull request #142 from timwindsor/master

Adds location for two contributors