conflict test 2
Merge branch 'master' of https://github.com/jmpg93/testjmpg933

Conflicts:
	Test/AppDelegate.m