added new feature
added another feature
Merge branch 'feature'

Conflicts:
	TestApp/TestApp/TESTAppDelegate.m