checkin b4 merge
Merge branch 'master' of github.com:ptillemans/snamblog

Conflicts:
	project.clj