git rebase
very basic slideshow
Installed express-session, added boilerplate passport middleware and authentication function.
MySQL setup
Merge pull request #37 from bernardchu/feat/auth

Installed express-session, added boilerplate middleware and auth function
Merge pull request #39 from COPPER-BOBCAT/staging

Installed express-session, added boilerplate middleware and auth function
Changed OpenID URLs to reflect our website URL change.
Merge pull request #40 from bernardchu/feat/auth

Changed OpenID URLs
Merge pull request #41 from COPPER-BOBCAT/staging

Changed OpenID URLs
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
MySQL setup
MySQL setup
Database connection fix
Merge pull request #44 from COPPER-BOBCAT/staging

Staging
conflict res
Merge branch 'master' of https://github.com/RTakes/COPPER-BOBCAT

Conflicts:
	server/db/indexDB.js