forget this shit
Merge branch 'gh-pages'

Conflicts:
	.gitignore
adding a bg photo and a little animation