Fix conflict
Merge branch 'developmentAlpha' of https://github.com/jnthntatum/CollabMe into developmentAlpha