Finalized spacing for auto layout color buttons

…
Merge branch 'master' of https://github.com/TeamCHC/ios

Conflicts:
	assignment1/assignment1/Base.lproj/Main_iPhone.storyboard
Merge branch 'master' of https://github.com/TeamCHC/ios

Conflicts:
	assignment1/assignment1/Base.lproj/Main_iPhone.storyboard