Finished Exercise 1 w/ extra credit
Finished Exercise 6 with extra credit
Merge branch 'master' of https://github.com/DaKuY/rails_web_app