moon phases and location update

Conflicts:
css/style.css