Delete README.txt
Test Branch Commit
First Version of Login Authentication - Also Added Registration Module to Source
Simple Homepage Login Authentication
Merge Login-Auth and File Upload
Preparing to merge with Lee
Merge Lee and Tyler
Merge branch 'master' of https://github.com/KruzKalke/music-stream
Cleaned up directories
Finalized Debugging Merge Errors
Login Redirect Authentication
logout goes to login page
Merge branch 'master' of https://github.com/KruzKalke/music-stream

Conflicts:
	db.sqlite3
	muse/__init__.pyc
	muse/settings.pyc
	muse/urls.pyc
	muse/wsgi.pyc
	music_stream/__init__.pyc
	music_stream/forms.pyc
	music_stream/migrations/0003_auto_20141118_1724.pyc
	music_stream/models.pyc
	music_stream/urls.pyc
	music_stream/views.py
	music_stream/views.pyc
	registration/__init__.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/management/__init__.pyc
	registration/models.pyc
	registration/signals.pyc
	registration/users.pyc
	registration/views.pyc
Test for Kevin's Branch
Testing
Updates:
   - Song name in model is now automatically acquired from the file name instead of entered in by a form
   - Song name is also modified to remove extension
   - Static directory has been set up, and Bootstrap is now there as well as a custom CSS file
   - UI upgrade for short-term work
Merge branch 'tyler' of https://github.com/KruzKalke/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/__init__.pyc
	music_stream/models.pyc
	music_stream/urls.pyc
	music_stream/views.pyc
	registration/__init__.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/management/__init__.pyc
	registration/models.pyc
	registration/signals.pyc
	registration/users.pyc
	registration/views.pyc
changes
Merge pull request #1 from KruzKalke/tyler

Tyler
Updates:
   - UI changes
      - removed play button and download button
         - playing is now done by clicking song name
         - download can be added back but I'm thinking of adding that to a right-click menu
      - minor aesthetic updates
   - added streaming library, audio.js
   - implemented streaming
      - current implementation treats list of songs as a playlist. click on a song in the list to play it