Eliminated horizontal scrolling
Merge branch 'master' of https://github.com/umass-cs-326/team-jmash

Conflicts:
	src/BitBot/public/stylesheets/style.css