Something slightly reminicent of a beginning of an API
Merge branch 'master' of github.com:isfit/events

* 'master' of github.com:isfit/events:
  stuff