resolve git failures
first draw of navbar
fixed navbar and bootstraped show view
Editing buttons show view
create and edit view
adaptation button <-> navbar
Merge branch 'master' of https://github.com/New-York-Falcons/orienteering-game into bootstraping
adapte button layouts
fixed bugs with  buttons and navbar css
Fixed navbar style
Fixing bugs of button display
Correction bugs in buttons display
corrections from pull reqest
Merge branch 'master' into bootstraping

Conflicts:
	db/schema.rb
Merge pull request #6 from New-York-Falcons/bootstraping

Bootstraping