MySQL setup
MySQL setup
Database connection fix
conflict res
Merge branch 'master' of https://github.com/RTakes/COPPER-BOBCAT

Conflicts:
	server/db/indexDB.js
Merge pull request #45 from RTakes/master

Server conflict