checkout styles
whoops
Merge remote-tracking branch 'origin/master'

Conflicts:
	BNRChallenge/BNRChallenge/Base.lproj/Main.storyboard
Merge remote-tracking branch 'origin/master'
integrating checkout
Merge remote-tracking branch 'origin/master'