fghj
Merge branch 'master' of https://github.com/MEASchool/WordFlash

Conflicts:
	WordFlash/en.lproj/MainStoryboard_iPhone.storyboard