setting up pipeline
Merge branch 'master' of https://github.com/smidget/DatabasesS2014Project
formatting
Merge branch 'master' of https://github.com/smidget/DatabasesS2014Project
testing, testing
Merge branch 'master' of https://github.com/smidget/DatabasesS2014Project
testing testing
Merge branch 'master' of https://github.com/smidget/DatabasesS2014Project
5 queries working, woohoo
Merge branch 'master' of https://github.com/smidget/DatabasesS2014Project