first commit
up to date
Merge branch 'master' of github.com:TimeHackathon/TimeTime
Merge branch 'master' of github.com:TimeHackathon/TimeTime
changed migrations
Merge branch 'master' of github.com:TimeHackathon/TimeTime