Only in .m
Merge branch 'master' of github.com:comcuter/testMerge

Conflicts:
	testMerge/AppDelegate.m