Add second view
Merge branch 'master' of github.com:plougy/bracelate-app

Conflicts:
	bracelateapp.xcodeproj/project.pbxproj