merged
commit before moving to test_branch
made new.html.erb file
resolved merge conflicts
Merge pull request #26 from tbuchanan/master

pull