Adding all files currently in fall2014
Merge branch 'master' of github.com:PercyODI/CS1050