Changed App Icon
Merge branch 'master' of https://github.com/giatschool/OriGami-for-iOS

Conflicts:
	Ori-Gami.xcodeproj/project.pbxproj
	Ori-Gami/en.lproj/MainStoryboard_iPad.storyboard