Rename Project.md to README.md
Merge branch 'justinelam-master'
Syncing with Amys version
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
	app/views/layouts/application.html.erb
put navigation in layouts/application
Merge remote-tracking branch 'upstream/master'
orgs events venues tables created
Merge branch 'natashashannon-master'