chanesgas
Merge branch 'master' of https://github.com/bmca4u/ILDC_Project

Conflicts:
	PhotoEditingTool/StoryBorad/Main_iPhone.storyboard