New Architecture

Archictecture changed. A lot of views and controllers are not working
now.
Merge pull request #7 from kylestlb/nicoleBranch

New Architecture
Jordan : Merged master & NicoleBranch

Hopefully this works