Merge pull request #13 from pannellr/master

Updating Matt's branch
Merge pull request #25 from pannellr/pannellr

updates to subject class abstracting database methods
Adding concrete builder classes
Merge branch 'burkem13' of https://github.com/pannellr/3132GroupProject into burkem13
Merge branch 'master' of https://github.com/pannellr/3132GroupProject

Conflicts:
	modules/database/insertbuilder.py
changing shebangs to #!/local/bin/python