test
updated Gemfile
Application added to Shelly Cloud
Show single event page mockup
Fix typo in show.haml
updated Cloudfile / removed db\development.sqlite3
Change show.haml to show.html.haml
[#42] Remove commented out code from Gemfile, remove sqlite3 db
ignore logs
Merge branch 'master' of https://github.com/gotar/Internship-calendar-UI
Fix indentation in layout, rename welcome/index.haml to index.html.haml for consistency
Use OpenStruct to emulate database object for 'show' view
Remove new lines from event_controller
Revert "Merge branch 'master' of https://github.com/gotar/Internship-calendar-UI"

This reverts commit ef56b31b21b6d52d0ad1a77b506bb87f4d8db8c1, reversing
changes made to 0f3187634a22d9a53a184e8360f5513a77cb646d.
Change events_name to name, reduce line length in 'show' view
Merge branch 'events_show' of github.com:gotar/Internship-calendar-UI into events_show

Conflicts:
	Gemfile
Merge pull request #6 from gotar/events_show

Events show
[#40] Merge branch 'master' into user-sign-up

Fixed conflicts in:
	Gemfile
	Gemfile.lock
	app/views/layouts/_header.html.haml
	config/routes.rb