merging with kruz
Merge branch 'kruz' of https://github.com/KruzKalke/music-stream into tyler
Songfiles Are Saved When MD5 Is Unique
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
Fixed bug in searching for album
Merge branch 'kruz' of https://github.com/KruzKalke/music-stream into tyler

Conflicts:
	music_stream/models.py
trying to commit bug fix in search
lots of updates

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

Tyler