sinatra template
Merge branch 'master' of github.com:pxlpnk/sinatra-template

Conflicts:
	.gitignore