adds initial View implementation
adds controller skeleton
resolves merge conflicts
MVP implementation