updating file service
commiting changed cass
resolving conflict
Merge branch 'master' of https://github.com/manisero/MIPWorkshop