finished whiteboard
Merge branch 'developmentAlpha' of github.com:jnthntatum/CollabMe into developmentAlpha