changes by Allen
Merge branch 'master' of https://github.com/buuav/fall2014