Modify events controller and modify index.html.haml
Modify events controller and modify index.html.haml
merged gemfile.lock
Removed empty lines
Merged changes
Merge branch 'master' of https://github.com/gotar/Internship-calendar-UI into view_public_events
Merged new changes from others
[#38]Changed array of hash with events into array openstructs
[#38] Bugfixes in events_controller
[#38] Merged with user-sing-up
[#38] Added bootstrap to viewing public events
Merge branch 'master' of github.com:gotar/Internship-calendar-UI into view_public_events
[#38] Bugfixes in events_controller and index.html.haml
[#38] Merge branch 'master' of github.com:gotar/Internship-calendar-UI into view_public_events

Conflicts:
	Gemfile
	Gemfile.lock
	config/routes.rb
[#38] Bugfixes in _form,edit,update.html.haml and in simple_form
[#38] Bugfixes in _header and remove unused gems
[#38] Bugfix in routes, changed /signup to sign_up
[#38] Merged with master
[#38] Merge branch 'view_public_events' with master.
[#38] Bugfixes in index.html and events_controller