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
Merge branch 'lee' of https://github.com/KruzKalke/music-stream into lee
Cleaning Up Extra Files
.