firstgit add .
added users
added pages
installed bootstrap
Installed bootstrap
added new routes
navbar added
added dynamic navbars
end of session4
Merge branch 'master' of github.com:zmon/kauffman-rails

Conflicts:
	.gitignore