account stuff
Merge branch 'master' of github.com:theturrible/MusicStream

Conflicts:
	static/css/main.css
fucking a