uploaded latest changes on frontend
Merge branch 'master' of github.com:tracke/train