Merge pull request #1 from cemmert/master

Edit index.html.erb file
Make more changes to views files
Merge pull request #1 from lmmedina90/master

Let's merge