Started assignment 3
ignore xcode userstate
Merge in updates from assignment 2
Merge branch 'assignment-3' of https://github.com/ThePromoter/stanford-ios7-matchismo into assignment-3
Removed file that shouldn't be tracked
Major progress to assignment 3
Assignment 3 done
Merge branch 'assignment-3'