preparing for heroku
Merge branch 'master' of github.com:laxrph10/teamplaylister

Conflicts:
	db/development.sqlite3
	log/development.log