John is more Awesome

jkdhsflkjshdflkgj
Merge branch 'master' of https://github.com/ND-C4/ND-Face

Conflicts:
	ND Face/ND Face/AppDelegate.h