late night testing
3/17
Merge branch 'master' of https://github.com/starakaj/rnecklace
Merge branch 'master' of https://github.com/starakaj/rnecklace

Conflicts:
	.gitignore
	Rhythm Necklace/Rhythm Necklace.xcodeproj/project.xcworkspace/xcshareddata/Rhythm Necklace.xccheckout