working on map image generation
Merge branch 'master' of github.com:ftomassetti/lands
Improving mountain and continent generation
Improving world generation
Merge branch 'master' of github.com:ftomassetti/lands
Using pillow instead of PIL
Adding Settlement type
Merge branch 'master' of github.com:ftomassetti/lands

Conflicts:
	app/models.py
	app/views.py