Added edit to subjects etc
Merge branch 'master' of github.com:jezer07/tracker