test
Merge branch 'master' of https://github.com/garvman/PocketRoster

Conflicts:
	.DS_Store
	PocketRoster2/.DS_Store
	PocketRoster2/Pocket Roster.xcodeproj/project.pbxproj
	PocketRoster2/Pocket Roster/en.lproj/MainStoryboard.storyboard