heroku & zurb
resigning from angular
Merge branch 'master' of github.com:Dellilah/conjugueur