Hoping this doesn't break merge?
Merge branch 'master' of github.com:gibiansky/adventurer

Conflicts:
	html/.index.html.swp
Merge branch 'master' of github.com:gibiansky/adventurer
Merge branch 'master' of github.com:gibiansky/adventurer
Fixed uploads for he gajillionth time.