Merge branch 'master' of github.com:davincicoders/2013-q3-rails-1

Added a couple HTML changes to 117c onefile.erb"