added /bin to .gitignore
Merge remote-tracking branch 'Cody/master'
Merging with cody
Merge remote-tracking branch 'Cody/master'
Attempting to merge with cody
Merge remote-tracking branch 'Cody/master'
Implemented mem game with the login in screen
Started working on a main view
got all of sams changes and hoping the reset button works

Conflicts:
	GamingWebUi/src/edu/ycp/cs320/gamingwebsite/client/GamingWebUi.java
	GamingWebUi/src/edu/ycp/cs320/gamingwebsite/client/MainWorld.java
	GamingWebUi/src/edu/ycp/cs320/gamingwebsite/client/MemView.java
	GamingWebUi/src/edu/ycp/cs320/gamingwebsite/client/loginView.java