Stuff
More Stuff
Merge branch 'master' of https://github.com/alexbestul/galvinator2
Got everything working with Gavin's changes