git files
Merge branch 'master' of https://github.com/cralor/cralor.github.io

Conflicts:
	.gitignore