Merge branch 'master' of https://github.com/mjelks/fhcs001a

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/mjelks/fhcs001a