hope this works
Merge branch 'master' of github.com:jedibear/PocketRosterFinal

this shit needs to be merged