controllers and views
Merge pull request #7 from Stephanie-Chou/restart

controllers and views