Many Changes as Discussed in Class
Merge branch 'master' of https://github.com/elefse/JADITO

Conflicts:
	src/InOut.as