update gitignore, remove old site
Merge branch 'origin/gh-pages'

Conflicts:
	about.html
	blog.html
	contact.html
	get-started.html
	index.html
	marketing.html
	projects.html
Merge branch 'origin/gh-pages'
remove files from bad merge
refactor completely