Added a view controller
Removed a view controller
Merge branch 'second_branch'

Conflicts:
	FunWithGit/FunWithGit.xcodeproj/project.pbxproj