Merge branch 'master' of github.com:Chantilly612Code/612-2014
more fixes
Merge branch 'master' of github.com:Chantilly612Code/612-2014