moving stuff around
Merge branch 'rollback-1'
Adding in lots of stuff I accidently removed yeay git

Conflicts:
	project.clj