Merge branch 'master' into John
Merge branch 'John'
smaller background file size, for web

smaller background file size, for web
Merge branch 'John'
Merge branch 'master' of https://github.com/GigaBots/Dashboard_Mindstorm
some css changes for the html page

add scrollbars by default (hopefully they work on iPhone and android
alright)
Merge branch 'Cole'

Conflicts:
	css/windowStyles.css
	index.html
conflict resolution
Merge branch 'master' into Cole