first commit
Merge branch 'master' of https://github.com/noah-mulfinger/hack2014
merge hmm