jkl
123
Merge conflict
small edit: application.css
Merge branch 'develop' of github.com:SimonNr/horseTours into develop
fu
fu2
add div 'topMenue' in menue
ADD: CanCan
Destroyed merge conflict
add favicon.ico, implemet it in application.html.erb
Merge branch 'develop' of github.com:SimonNr/horseTours into develop
edit seeds.rb, application.css
EDIT: Abilities: WORKING!
EDIT: Abilities: WORKING!
Destroyed merge conflict