Merge remote-tracking branch 'Sam/master'

Conflicts:
	.project
	GamingWebsite/src/edu/ycp/cs320/GamingSite/Achievments.java
	GamingWebsite/src/edu/ycp/cs320/GamingSite/Avatar.java
	GamingWebsite/src/edu/ycp/cs320/GamingSite/Game.java
	GamingWebsite/src/edu/ycp/cs320/GamingSite/HighScore.java
	GamingWebsite/src/edu/ycp/cs320/GamingSite/Image.java
	GamingWebsite/src/edu/ycp/cs320/GamingSite/Login.java
	GamingWebsite/src/edu/ycp/cs320/GamingSite/LoginScreen.java
	GamingWebsite/src/edu/ycp/cs320/GamingSite/MemBoard.java
	GamingWebsite/src/edu/ycp/cs320/GamingSite/MemCard.java
	GamingWebsite/src/edu/ycp/cs320/GamingSite/MemGame.java
	GamingWebsite/src/edu/ycp/cs320/GamingSite/MemScore.java
	GamingWebsite/src/edu/ycp/cs320/GamingSite/MemUser.java
	GamingWebsite/src/edu/ycp/cs320/GamingSite/Start.java
	GamingWebsite/src/edu/ycp/cs320/GamingSite/User.java
	GamingWebsite/src/edu/ycp/cs320/GamingSite/UserInterface.java
Merge branch 'master' of git@github.com:Aldornatin/GamingWebsite.git