Dashboard
Merge branch 'master' of https://github.com/sstraw/csci201-Group

Conflicts:
	csci201-Group-client/src/client/Widget.java
updates
Widget fixed(?) Fuck gits merge tool
Merge branch 'master' of https://github.com/sstraw/csci201-Group
Dashboard 2's ready for testing?
Dashboard 1-4 active listeners updated
Merge branch 'master' of https://github.com/sstraw/csci201-Group
Dashboard 3's updated
Added widget commands to 5_1
Level 4 adapter
Added widgets to 5_2 (missing JToggleButton)
Merge branch 'master' of https://github.com/sstraw/csci201-Group
Added widgets to 5_3
Merge branch 'master' of https://github.com/sstraw/csci201-Group
Added widgets to 5_4 (Missing JToggleButton)
updates
Merge branch 'master' of https://github.com/sstraw/csci201-Group
dashboard 5-2 finished
dashboard 5's probably done? ehhh