system32
ooo
Merge remote-tracking branch 'origin/master'

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