Merge branch 'master' of https://github.com/erw57/TravelPal-

Conflicts:
web/register.html