forced to push, so that i can pull
Merge branch 'master' of https://github.com/RSEllip/what-s-up-1.0.git

Conflicts:
	wazaa/src/ee/ttu/wazaa/main/Wazaa.java