Merge branch 'tyler' of https://github.com/KruzKalke/music-stream into tyler

Conflicts:
	music_stream/models.py
.
asdf
Merge branch 'tyler' of https://github.com/KruzKalke/music-stream into tyler
UI changes
UI Changes
UI Change
- Table inserted for each tags of the songs
- Table is also able to change with different sorting
- Sorting can be done by clicking on to the table headers
UI changes
- Inserted table where it neatly arranges all of the songs
	-- Perhaps more tags are needed to be displayed?
- You can also change the table by clicking onto table heade

Merge branch 'master' of https://github.com/seoklee/music-stream

Conflicts:
	db.sqlite3
	muse/__init__.pyc
	muse/settings.pyc
	muse/urls.pyc
	muse/wsgi.pyc
	music_stream/__init__.pyc
	music_stream/admin.pyc
	music_stream/forms.pyc
	music_stream/migrations/0001_initial.pyc
	music_stream/migrations/0002_music_name.pyc
	music_stream/migrations/0003_auto_20141118_1724.pyc
	music_stream/migrations/0004_song.pyc
	music_stream/migrations/0005_auto_20141128_0505.pyc
	music_stream/migrations/0006_song_owner.pyc
	music_stream/migrations/0007_song_album.pyc
	music_stream/migrations/0008_auto_20141128_2209.pyc
	music_stream/migrations/0009_auto_20141129_1753.pyc
	music_stream/migrations/__init__.pyc
	music_stream/models.pyc
	music_stream/urls.pyc
	music_stream/views.pyc
	mutagen/__init__.pyc
	mutagen/_compat.pyc
	mutagen/_constants.pyc
	mutagen/_file.pyc
	mutagen/_tags.pyc
	mutagen/_util.pyc
	mutagen/easyid3.pyc
	mutagen/id3/__init__.pyc
	mutagen/id3/_frames.pyc
	mutagen/id3/_specs.pyc
	mutagen/id3/_util.pyc
	mutagen/mp3.pyc
	registration/__init__.pyc
	registration/admin.pyc
	registration/auth_urls.pyc
	registration/backends/__init__.pyc
	registration/backends/simple/__init__.pyc
	registration/backends/simple/urls.pyc
	registration/backends/simple/views.pyc
	registration/forms.pyc
	registration/models.pyc
	registration/signals.pyc
	registration/users.pyc
	registration/views.pyc
	static/css/home.css
	templates/base.html
	templates/music_stream/.index.html.swp
	templates/music_stream/index.html
Minor CSS change that might affect sorting
	- First letterw will be capitalized
Major UI changes
	- Tables are there to display the music you own
		- There are several categories, I might need to add more later.
	- Songs can also be sorted
right click menu
Merge branch 'lee' of https://github.com/KruzKalke/music-stream into lee
Cleaning Up Extra Files
.