just a commit
:w
:wq

 Please enter the commit message for your changes. Lines starting
Merge branch 'initialCanvas' of https://github.com/jitterbugboy/draw2gether into initialCanvas

Conflicts:
	.idea/workspace.xml
update gitignore
removed . idea files