Merge pull request #9 from mbathletes/andres

Andres
added more views
fixed conflicts
Merge pull request #10 from mbathletes/dylan

Dylan
post controller
Merge branch 'master' of https://github.com/mbathletes/mbathletes into dylan
Merge pull request #11 from mbathletes/dylan

Dylan
Minor code refactor
tab size merge conflict