Derp and Pallet town!
Merge branch 'master' of https://github.com/chizu/berlin

Conflicts:
	City - New City (23).sc4
	City - New City (4).sc4
	City - New City (53).sc4