2
Merge branch 'master' of https://github.com/COMSW6998/NewPlanner.git

Conflicts:
	EventPlanner/src/com/example/view/MainActivity.java
Merge branch 'master' of https://github.com/COMSW6998/NewPlanner.git

Conflicts:
	EventPlanner/src/com/example/view/MainActivity.java