first real commit
Merge remote-tracking branch 'origin'
uh oh
hi
hi
Merge branch 'master' of github.com:AlexanderBruce/Jinx

Conflicts:
	jinx/GameModel.h
	jinx/GameModel.m
	jinx/LoginViewController.m