Device controller/views changed
Merge branch 'master' of https://github.com/Minkey27/Week-3-WAD