nav
nav
add gitignore file
Merge branch 'navbar'
attempt3
Merge branch 'master' of https://github.com/unknownbreaker/bachelor.ette

Conflicts:
	app/views/_logged_in.erb
	public/css/application.css
Merge pull request #11 from PLopezD/master

buttons