changed time tick function
Remove some TODO's

Conflicts:
	Data Structures/Assignment 2/DS -
Assignment2/src/Assignment2/Group.java
	Data Structures/Assignment 2/DS -
Assignment2/src/Assignment2/User.java
	Data Structures/Assignment 2/DS -
Assignment2/src/Assignment2/Whatsapp.java
Merge branch 'master' into 5