init
add deploy.yml to gitignore
Fix merge conflicts + add flat html for site

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock