Update 1
Merge branch 'master' of https://github.com/EventifyApp/Eventify

Conflicts:
	README.md
	readmepics/Thumbs.db