testing db
Pushpush
Merge branch 'feature/web'
coffeescript support works
Merge branch 'master' of github.com:LeShadow/hackiothon