Initial commit
Added in needed files
Made a project in eclipse
added second frame thingy and text box
text editor works now
First attempt at using Collabrify API
removed the added activity and only left the orginal. moved code to it
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
added in other stuffs
added in stuffs
settled merge conflic
added collabrify object
Merge branch 'master' of https://github.com/SSirakov/EECS441P1