initial commit
Merge branch 'master' of github.com:lovio/lovio.github.io

Conflicts:
	.gitignore