Some new stuff and deletion of the storyboard - using nib instead!
Merge branch 'U.C.1' resolved

Conflicts:
	TestGit.xcodeproj/project.pbxproj