Friday Progress Report 302

Still reworking town, adding end-day screen