Git is messin me up
Merge branch 'master' of https://github.com/headdetect/headdetect.com

Conflicts:
	.gitignore