Added new files
Fixed dependencies
Merge branch 'master' of github.com:smaak/clj-boilerplate

Conflicts:
	myapp/project.clj
	myapp/src/myapp/core.clj
Resolved