pulling shit
trying againMerge branch 'master' of https://github.com/CaptainKanuk/eartraining

Conflicts:
	db.sqlite3
	templates/pages/intervals.html
getting stuff
getting stufMerge branch 'master' of https://github.com/CaptainKanuk/eartraining

Conflicts:
	db.sqlite3
trying againMerge branch 'master' of https://github.com/CaptainKanuk/eartraining

Conflicts:
	.DS_Store
	db.sqlite3
	static/.DS_Store
yaaaaaay logout
aaaand again Merge branch 'master' of https://github.com/CaptainKanuk/eartraining

Conflicts:
	.DS_Store
	db.sqlite3
	static/.DS_Store