Updated stuff
Merge branch 'master' of https://github.com/team3499/2014