Merge branch 'master' of https://github.com/Luftzig/Chores

Conflicts:
	Chores/src/il/ac/huji/chores/MessagesToServer.java
Missing resources
Merge branch 'master' of https://github.com/Luftzig/Chores