git rebase
very basic slideshow
Merge pull request #42 from zindlerb/master

made basic slideshow
Merge pull request #38 from RTakes/master

MySQL setup
Merge pull request #44 from COPPER-BOBCAT/staging

Staging
Merge pull request #45 from RTakes/master

Server conflict
Merge pull request #46 from RTakes/master

fixed conflict
Refactored auth to use Github instead of Google, may not totally work yet.
Merge pull request #47 from bernardchu/feat/auth

Feat/auth
Merge pull request #48 from COPPER-BOBCAT/staging

Refactored auth to use Github instead of Google
Merge pull request #50 from RTakes/master

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

Staging
db updates