syncing cole's branch locally on john's computer

syncing cole's branch locally on john's computer
syncing cole's branch locally on john's computer

syncing cole's branch locally on john's computer
Merge branch 'Cole' of https://github.com/GigaBots/Dashboard_Mindstorm into Cole

Conflicts:
	js/jquery.min.js
	js/main.js