e
Merge branch 'gh-pages' of https://github.com/badassguigroup/FlyingDutchman into gh-pages

Conflicts:
	css/main.css
jaja
fixed
Merge branch 'gh-pages' of https://github.com/badassguigroup/FlyingDutchman into gh-pages