git strul
Merge branch 'master' of https://github.com/JohnnyThuland/GroupChat

Conflicts:
	prop