Merge remote-tracking branch 'codyhh09/master'
Fixed packages by deleteing old package
fix line endings in .gitignore?
updates
Merge remote-tracking branch 'codyhh09/master'
Updates to UI
Merge remote-tracking branch 'chad/master'
Merge remote-tracking branch 'J-Fid/master'

Conflicts:
	GamingWebUi/src/edu/ycp/cs320/gamingwebsite/client/MemView.java
starting over
d
updating update
yes
Merge remote-tracking branch 'origin/master'