Prepare to run with foreman and a .env configuration file
added social media icons to images file
added google map js
reverted to original stylesheet
index views
Ignore .DS_Store files
added social media icons to images file
added google map js
reverted to original stylesheet
index views
Hide goog maps API key in env variable
Merge branch 'sarahs_branch' of github.com:ahegyi/vibe into sarahs_branch

Conflicts:
	app/views/vibe/index.html.erb
Merge pull request #2 from ahegyi/sarahs_branch

Merging fo real
Remove the f-ing DS Store files
Merge branch 'master' into matts_branch

Conflicts:
	.gitignore
	app/views/vibe/index.html.erb