Adam - fixing repo
Adam - trying to fix repo
Merge branch 'master' of https://github.com/adamwilhelmi/DAWCS

Conflicts:
	bin/classes.dex
	bin/classes/com/cs/oswego/edu/dawcs/ChannelController$2.class
	bin/classes/com/cs/oswego/edu/dawcs/ChannelController.class
	bin/classes/com/cs/oswego/edu/dawcs/DAWCS$1.class
	bin/classes/com/cs/oswego/edu/dawcs/DAWCS$2.class
	bin/classes/com/cs/oswego/edu/dawcs/DAWCS.class
	src/com/cs/oswego/edu/dawcs/DAWCS.java
Adam - trying to fix repo

Many updates needed, do not do a pull until I get this all ironed out.