getting ready for compotition
Merge branch 'master' of https://github.com/DarkMatter4150/2013-2014_BlockParty