resolving merge issues
fixed merge issue
Merge branch 'gh-pages' of https://github.com/BadAssGUIGroup/FlyingDutchman into gh-pages

Conflicts:
	css/main.css