mod deploy files
changed db to mysql
Merge branch 'master' of https://github.com/jmzoltek/media_app

Conflicts:
	config/deploy.rb