Move Song class to its own file
General Maintenance
Merge branch 'master' into dev

Conflicts:
	app/controllers/main_controller.rb
	app/controllers/songs_controller.rb
	app/models/song.rb
	config/application.rb
	config/environments/production.rb