added button creation
Merge remote-tracking branch 'origin/master' into tweens-and-dragons

Conflicts:
	js/site.js