Refactor activities
Activity real men
merge
Merge branch 'master' of https://github.com/kazamafury/ter