Add Om and some other shit I don't really remember
Merge branch 'master' of https://github.com/bsummer4/cljshw

Conflicts:
	project.clj