First version of navbar
Mockup of the dashboard
Removed comments; Removed sqlite from bundle
Replace lock file
Updated gemfile
Removed sqlite
Merge branch 'master' of https://github.com/makdisse/freenet-redesign

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/stylesheets/redesign.css.scss
	app/views/layouts/application.html.erb
	app/views/redesign/_navbar.html.erb
	app/views/redesign/welcome.html.erb
	config/routes.rb