j
Merge branch 'master' of https://github.com/scott223/vamos

Conflicts:
	Vamos/Base.lproj/Main.storyboard