my changes
Merge branch 'master' of https://github.com/integralhero/rally
edit activity almost working, date is still broken, spent too long getting this much to work hahaha