Merge branch 'master' into Cole
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
syncing cole's branch on john's computer

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

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

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

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

for real
extend bottom margin
Merge branch 'master' into Cole
Merge branch 'Cole'