barebone, not working yet
Merge branch 'master' of github.com:Rowanto/scalaBlog

Conflicts:
	.gitignore