minor
Merge branch 'master' of github.com:robbymckilliam/sounderC

Conflicts:
	nbproject/private/private.xml
Merge branch 'master' of github.com:robbymckilliam/sounderC
blerg