major
ok
1
Merge branch 'master' of https://github.com/RSEllip/what-s-up-1.0.git

Conflicts:
	wazaa/src/ee/ttu/wazaa/GUI/GUI.java