added pretty urls and images to stream objects
merging master
Merge pull request #9 from nramin/duba

Duba
merge
Merge branch 'vijai'
merge
small stuff
fixed the like functionality
added songplayer to pages, need volume control and master pause and play
added model logic to user, started on search and added explore link
Merge branch 'duba'

Conflicts:
	app/views/song/profile.blade.php
pretty URL handles all characters
Merge pull request #11 from nramin/vijai

pretty URL handles all characters
making explore tight
explore page done
that pizza put me in a weird place
Minor updates to url
Merge pull request #12 from nramin/vijai

Minor updates to url
Fixed music player
Take all my shit BESWETHERICK