maybe can post some stuff now
Merge branch 'master' of github.com:gibiansky/adventurer

Conflicts:
	html/mainpage.html
stop buttons being red when user makes a choice