first commit
Merge branch 'master' of https://github.com/alexpi/site_template

Conflicts:
	.gitignore
	package.json