started on my branch
more work on my branch
even more work
probably will need to delete this commit
Some jim-bob code
more stuff from jim-bob
jim-bob deleted that line!
im directly committing to development !!!!!
Merge branch 'jim-bobswork' into development
Merge branch 'development' of git@github.com:jmagic/testing.git into development
added submodules
added modules
Merge branch 'development' of https://github.com/jmagic/testing into development

Conflicts:
	.gitmodules
not suer
adding submodules
adding device 1
added name 2 and name 3
Added device 1
added id's 2 and 3
Merge branch 'adding_device_values' into development