add homework
Merge branch 'master' of https://github.com/wsjyz/manhattan_ios

Conflicts:
	ManhattanEnglish/Base.lproj/Main.storyboard