merged
Merge pull request #25 from tbuchanan/master

pull
commit before moving to test_branch
made new.html.erb file
resolved merge conflicts