changed some data structure stuff and added a few helper functions
Merge branch 'aidFix' of github.com:Daniel-Christopher/NextNewCA into aidFix

Conflicts:
	ArduinoSketch1.ino
Cleaned up code after tests