Init RSpec + Fix version uncompatible error
Merge branch 'Test' of https://github.com/zatcsc/group5.k57ca into Test
Merge pull request #5 from zatcsc/Test

Test
fix conflict merging
Edit Gemfile
Edit about page
Edit about page
Merge pull request #7 from zatcsc/about

Edit about page
Some basic database works

Created database for Traffic Jam places
Created a simple submit page
Showed some sample jam data

Some sample jam places show on the map, can't be turned off at the
moment.
Added toggle button to show/hide traffic jam
Fixed map showing incorrectly after resize
Fixed a problem with running js code

Fixed js code not run in any page but the ROOT page
Geocoding included
Merge branch 'TrafficInformation' of github.com:zatcsc/group5.k57ca into TrafficInformation
Adapted master branch change
Fixed some bugs after merged with master
Routed root page back to the login page
Merge branch 'master' into TrafficInformation

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/stylesheets/custom-css.css
	app/controllers/welcome_controller.rb
	app/views/layouts/_left_slidebar.html.erb
	app/views/layouts/application.html.erb
	app/views/welcome/map.html.erb
	config/routes.rb
	coverage/.last_run.json
	db/schema.rb
Updated login method