model, view, and controller working
Merge origin/master