upload stuff
Merge branch 'master' of https://github.com/cbeckett/CMPUT391_WebRIS

Conflicts:
	project/CMPUT391_RIS/build/classes/.gitignore