changed markers to now update event count when events remove
Merge branch 'master' of https://github.com/OJ7/CampusEventsApp
fixed colors of FABs
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/example/campuseventsapp/MainActivity.java
merged with omairs code -  update marker
offsets each png by a little so its not covered up by text
Merging with everyone