merging with kruz
Merge branch 'kruz' of https://github.com/KruzKalke/music-stream into tyler
Test
Merge branch 'kruz'
Updates:
  - To the Model
    - added new fields to the song Object
    - added slug fields for album and artist (this is for URLs)
  - Added search functionality
    - searching returns matches for substrings in artists, albums, and songs
    - the results for artists and albums are links
    - artist pages are created on the fly and list all albums and songs by that artist
    - album pages are also created on the fly and list all songs in that album
    - artist and album pages can be accessed directly without needing to search
       - going to any localhost:8000/artist/<artistname> or localhost:8000/album/<albumname> automatically creates and displays that page
  - For implementing search, I created three new views, three new templates, and I also made changes to urls.py
trying to remove files
.
Merge branch 'tyler' of https://github.com/KruzKalke/music-stream into tyler

Conflicts:
	music_stream/models.py
.
Merge branch 'tyler' into kruz
Fixed bug in searching for album
Merge branch 'kruz' of https://github.com/KruzKalke/music-stream into tyler

Conflicts:
	music_stream/models.py
asdf
trying to commit bug fix in search
Merge branch 'tyler' of https://github.com/KruzKalke/music-stream into tyler
lots of updates

Merge remote-tracking branch 'origin/master' into tyler
Merge pull request #3 from KruzKalke/tyler

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