MVC
Merge branch 'master' of https://github.com/dud3/ADMIRAL