wrecking boys
Merge branch 'master' of https://github.com/KyleDavidsonPro/Dota2App

Conflicts:
	Dota2App/Dota2App/en.lproj/MainStoryboard_iPad.storyboard
Merge branch 'master' of https://github.com/KyleDavidsonPro/Dota2App