trying to update
updates homepage
updating song and song title
Merge branch '3rdupdate'

Conflicts:
	app/views/home/index.html.erb
	db/development.sqlite3