add .gitignore
Merge remote-tracking branch 'Chad/master'

Conflicts:
	MartinDatabase/.gitignore
Reconfiguring packages to make more sense. Deleted Unnessacary files.
Total restructor.
Continued Restructor
Some fun things
Merge remote-tracking branch 'Dan/master'

Conflicts:
	MartinDatabase/src/edu/ycp/cs320/User/User.java