db credential update
Merge pull request #50 from RTakes/master

db credential update
Merge pull request #51 from COPPER-BOBCAT/staging

Staging
made some changes to the tables
put in basic template routes and controllers
trying to resolve conflicts