you can now become a sitter
Merge branch 'master' into requestBranch
Merge branch 'master' into sitterBranch

Conflicts:
	Petsies/en.lproj/Main.storyboard
Merge pull request #15 from yoonsw15/sitterBranch

Sitter branch