THE USER STUFF IT IS KIND OF WORKING NO
same as before
trying again Merge branch 'master' of https://github.com/CaptainKanuk/eartraining

Conflicts:
	.DS_Store
	db.sqlite3
	static/.DS_Store
	templates/.DS_Store