fixed errors and bugs and fixed div issues. worked on admin page and adjust some styling and functionality of delete
fixed conflicts
Merge pull request #45 from mbathletes/dylan

Dylan