Combined extensions to single project
Removed extraneus files
For merge
Merge branch 'master' of https://github.com/FRCTeam1719/DashboardExtension

Conflicts:
	CameraExtension/src/org/firstteam1719/dashboard/CameraExtension/VisonExtension.java
	Dashboard/nbproject/project.properties
For merge
For merge