initialize
Merge branch 'master' of github.com:notyy/spray-template

Conflicts:
	README.md