Project 7

- User is allowed to upload more than one file at a time
Merge branch 'master' of ssh://github.com/JllyGrnGiant/music_stream

Conflicts:
	app/views/users/show.html.erb