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

Dylan