I committed. Yay..............
Merge branch 'master' of github.com:kish9nine/groupfit

Conflicts:
	groupfit/groupfit/settings.py
	groupfit/groupfit/views.py
	groupfit/playlists/templates/create_playlist.html
Removed empty readme file?
Merging succesfully? Hopefully? Oh god please.