Replace master branch with page content via GitHub
initial checkin
Merge branch 'master' of http://github.com/feromax/feromax.github.io

Conflicts:
	index.html