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

Conflicts:
	WordFlash.xcodeproj/project.pbxproj