changed home html
change to home.html
Merge github.com:aaronsamuel137/whats-up
Merge github.com:aaronsamuel137/whats-up
Merge github.com:aaronsamuel137/whats-up
fixed merge conflict in home.html