Replace master branch with page content via GitHub
Merge branch 'master' of https://github.com/floorman/floorman.github.io

Conflicts:
	index.html
Merge pull request #1 from floorman/master

Master