Merge remote-tracking branch 'chad/master'
Merge remote-tracking branch 'chad/master'
new package
starting over
d
updating update
yes
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
canvas working
save me
working on web.xml
something
sdaf
something
yes
Update .gitignore
Merge remote-tracking branch 'Cody/master'

Conflicts:
	.gitignore
	GamingWebUi/src/edu/ycp/cs320/gamingwebsite/GamingWebUi.gwt.xml
	GamingWebUi/src/edu/ycp/cs320/gamingwebsite/client/GamingWebUi.java
	GamingWebUi/src/edu/ycp/cs320/gamingwebsite/client/MemView.java
	GamingWebsite/src/edu/ycp/cs320/gamingwebsite/shared/Image.java
	GamingWebsite/src/edu/ycp/cs320/gamingwebsite/shared/MemCard.java