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

made basic slideshow
MySQL setup
Database connection fix
res conflict
Merge pull request #38 from RTakes/master

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

Staging