uploading files, windows version of github decided to be "dirty" and crash non stop
Merge branch 'gh-pages' of https://github.com/ebhemmanuel/wsdonline into gh-pages

Conflicts:
	css/mystyle.css
	images/background.jpg
	images/bg.png
	images/customui.jpg
	images/default_ui
	images/defaultui1.jpg
	images/ffxiv_20130715_015837.png
	images/logo.gif
	images/notdefault.jpg
	images/settingsui.jpg
	index.html