testing merge 3
Merge remote-tracking branch 'origin/patrick-branch'
merge conflict resolved in table.cpp
testing merge 4 -ER
Organized Documentation\week2 -PS
Revert "testing merge 3"

This reverts commit 5de2dd66b65cbb8d7f01b7d46c12e6c57ce0aa2b.
we're using vector o' vectors -PS
Edited Table -PS
Added database class -WB
created Main class -WB
private vector member -PS
Table class compiles, Entry as a class -PS
Primitive table tests (in _tmain) -PS

Will develop more extensive unit tests
Table Class with minimal testing -PS
remove my change to gitignore -PS
fixing toolset problem -PS
again -PS
merge test -PS
Merge remote-tracking branch 'origin/patrick-branch'
edit comment in Main -WB