Changes made by Desislava Plam (desislava.plam@gmail.com).
Changes made by Desislava Plam (desislava.plam@gmail.com).
Merge branch 'master' of https://github.com/DesislavaPlam/WhereAmI.git

Conflicts:
	WhereAmI/index.html
	WhereAmI/styles/custom.css