Fixheat!
Fixheat!
Merge branch 'master' of https://github.com/fixbeat/fixbeatapi.git

* 'master' of https://github.com/fixbeat/fixbeatapi.git:
  Initial commit
Resolve conflicts