changed proj file, about to create new branch to do networking stuff
Merge branch 'master' of https://github.com/Cthulu93/CS121-2014
merged master with Pauls after he added CoreData