Done!
Merge branch 'master' of github.com:hawaiianchimp/CSE135-Project

# By Bonnie
# Via Bonnie
* 'master' of github.com:hawaiianchimp/CSE135-Project:
  small db connection stuff