pulling
Merge branch 'master' of github.com:TimeHackathon/TimeTime
Merge branch 'master' of github.com:TimeHackathon/TimeTime
Merge branch 'master' of github.com:TimeHackathon/TimeTime
changing some stuff
Merge branch 'master' of github.com:TimeHackathon/TimeTime