bunch o changes
Merge branch 'master' of https://github.com/yovetichg/SummaSteelCityCodeFest2014