Merge branch 'master' of github.com:Gashington/bvsButtonGenerator

Conflicts:
	dev/css/main.css
	dev/js/main.js
	dev/stylus/main.styl
Merge branch 'master' of github.com:Gashington/bvsButtonGenerator