working on bringing in database
Database seems to be integrated
Doing databasey things
updated sub-module ... ?
Updated submodule
Final Submodule Update?
test...
still updating subrepository
Merge branch 'master' into database

Conflicts:
	information
	information/images/projectcourses.png
	information/information.html
	information/informationHardware.html
	information/informationIntro.html
	information/informationOrganization.html
	information/informationOrganization1.html
	information/informationOrganization2.html
	information/informationOrganization3.html
	information/informationProgrammer.html
	information/informationProgrammer1.html
	information/informationProgrammer2.html
	information/informationProgrammer3.html
	information/informationUser.html
	information/informationUser1.html
	information/informationUser2.html
	information/informationUser2b1.html
	information/informationUser2b2.html
	information/informationUser2b3.html
	information/informationUser2b4.html
	information/informationUser2b5.html
	information/informationUser2b6.html

pulling stuff from master: it was upset that everything is now a subrepository
Merge branch 'database' of github.com:Watson-Reboot-Project/FullVersion into database
Bump database repo version
Merge branch 'master' into database

Conflicts:
	information
	information/images/selectcsmajors.png
	information/images/studentrelation.png
	information/information.html
	information/informationHardware.html
	information/informationIntro.html
	information/informationOrganization.html
	information/informationOrganization1.html
	information/informationOrganization2.html
	information/informationOrganization3.html
	information/informationProgrammer.html
	information/informationProgrammer1.html
	information/informationProgrammer2.html
	information/informationProgrammer3.html
	information/informationUser.html
	information/informationUser1.html
	information/informationUser2.html
	information/informationUser2b1.html
	information/informationUser2b2.html
	information/informationUser2b3.html
	information/informationUser2b4.html
	information/informationUser2b5.html
	information/informationUser2b6.html

merging the subrepo! yay!