More Collabrifying
Merge branch 'master' of https://github.com/SSirakov/EECS441P1

Conflicts:
	collabrify-writer/bin/classes/com/example/collabrifywriter/FullscreenActivity.class
	collabrify-writer/src/com/example/collabrifywriter/FullscreenActivity.java
collabrifying fun