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
Formatting Changes to Assembly

Early changes made to the formatting of the figures in the Assembly
Chapter. Padding and wrap-around altered to fit on the page better as
well as handle smaller screen sizes better.

Known bugs: at a certain stage the Flags and Instruction Register
section wraps under the Registers too early.
More Assembly Figures

Added more figures to the assembly pages with the new system/formatting.
Final (?) Formatting Changes

Added some more changes to the formatting of the Assembly Figures with
potential support in the mobile front.
Obviously Not Final Formatting Changes

Changed bordering around the Program Counter, Instruction Register, and
Flag tables in the Architecture Tab.
Memory Coloring

Brought back a function to take care of coloring memory as the program
runs to illustrate the ties between memory and execution of code.
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!
Bump database repo version
moved Database from subrepo to a copy/pasta dump from external repo

this is gonna cause problems in the future. #CallingIt
Merge branch 'master' of github.com:Watson-Reboot-Project/FullVersion

Conflicts:
	assembly/assemblyProgramming2.html
	assembly/assemblyProgramming3.html
	assembly/assemblyProgramming4.html
	information/informationOrganization.html
	information/informationUser1.html

yay database things!