added parsing from xml into the main code structure
minor bug fix to XML tree creator
Merge branch 'master' of ssh://github.com/admachina/AwesomestTeam-Communication-Aids

Conflicts:
	iOSCode/Communication_Aid/Communication_Aid.xcodeproj/project.pbxproj
Merge branch 'master' of ssh://github.com/admachina/AwesomestTeam-Communication-Aids
options tree class
Merge branch 'master' of ssh://github.com/admachina/AwesomestTeam-Communication-Aids
incremental commit with options tree added but non functional
Merge branch 'master' of ssh://github.com/admachina/AwesomestTeam-Communication-Aids
have code that "should" implement options trees and email but I can't build the fucking project...
something in my checkouts is broken within the calibration view controller
weeee
 derp derp
Merge branch 'master' of ssh://github.com/admachina/AwesomestTeam-Communication-Aids

Conflicts:
	iOSCode/Communication_Aid/Classes/Communication_AidAppDelegate.m
	iOSCode/Communication_Aid/Classes/Profile.m
	iOSCode/Communication_Aid/Classes/TextInputViewController.h
	iOSCode/Communication_Aid/Classes/TextInputViewController.m
	iOSCode/Communication_Aid/Communication_Aid.xcodeproj/project.pbxproj
- Xml file reading works