initial commit
Merge branch 'master' of https://github.com/astuyve/home

Conflicts:
	.gitignore