Created correct header
Header is now correct
Fixed database merging
Fixed merge conflict in trail.rb
No real changes
Fixed merge conflict
Merge branch 'master' of https://github.com/rlfriedm/HAP-APP