Index styles
wip
merged develop
added notes controller
Merge branch 'develop' into adding-styles

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/layouts/application.html.erb
	app/views/welcome/index.html.erb
	config/routes.rb
merged from develop
Merge pull request #6 from cs-webdev/adding-styles

Adding bootstrap and some styles