Removed some test code I put in
Merge branch 'master' of github.com:galen0/441Assignment1

Conflicts:
	441.assignment1/bin/classes/edu/umich/imlc/collabrify/collabrify_dummy_app/R$string.class
	441.assignment1/bin/classes/edu/umich/imlc/collabrify/collabrify_dummy_app/R$style.class