added "type" string property for exercise class
Merge branch 'master' of https://github.com/ec327-char-izard/MyPersonalTrainer.git