fixed bugs and views
fixed conflicts
Merge pull request #47 from mbathletes/dylan

Dylan