setup
Merge pull request #29 from MaximeHerne/30minutes-method

30 minutes method
fix conflict
Merge pull request #30 from MaximeHerne/set

setup
ouala
Merge pull request #31 from MaximeHerne/view

ouala
setup
mercigus
Merge pull request #32 from MaximeHerne/orderactiveadmin

Orderactiveadmin
debug heroku app
nav
Merge pull request #33 from MaximeHerne/min

nav
conflict resolving