Landmark model, migration, and controller created
landmarks can now be drawn on the map
landmarks being saved
cities are now rendered on their respective tiles
Update game_play_map_generator.js
Update game_play_map_generator.js
merging landmarks
Merge branch 'master' into landmarks

Conflicts:
	app/.DS_Store
	app/assets/javascripts/.DS_Store
migration
merging landmarks
Merge branch 'master' of https://github.com/SpraggleRock/project_genesis