Renamed files and stuffs.  Updated for new ip address.  Spent forever
wasting time following bugs that don't exist.
Added a shutdown hook to clean up the sockets and audio channels.
Made the connections/disconnections secure and added a retry mechanism
for connecting to the glasses.
Merge branch 'master' of https://github.com/cmuellerrr/novo-of-oz
Merged with master.
Conflicts:
	data/proto.json
	images/step_1_1.png
	images/step_1_2.png
	images/step_2_1.png
	images/step_2_2.png
	images/step_3_1.png
	images/step_3_2.png
	images/step_3_3.png
	images/step_3_4.png
	images/step_3_5.png
	images/step_4.png
	src/edu/cmu/hcii/novo/OZ.java
	src/edu/cmu/hcii/novo/Screen.java