eb configuration
eb configuration
eb configuration
eb configuration3
eb configuration4
Merge branch 'master' of https://github.com/Kevinwalters/Cloud-Computing-Project

Conflicts:
	ConnectMeApp/EventController.pyc
	ConnectMeApp/views.pyc
updated views
merge conflicts