working on the initial layout and controllers
Merge branch 'master' into Omar
Merge pull request #1 from dashinfall3/Omar

working on controllers