added some things
Merge branch 'master' of github.com:JacobBoy/spring14