Merge branch 'master' of https://github.com/jenbisignani/mylocal-la

Conflicts:
index.html
fix to index conflict