Commit for HW2 9/22/13
Merge branch 'master' of https://github.com/zackmeath/DatabaseRepo