Merge pull request #1 from Caf131/dev-chris

Hello Olivia
I made a change...

in home.jsp and homecontroller.java!
Merge pull request #2 from deluda/master

I made a change...