(G) add simple_form
add association between landmark & address
Merge branch 'master' of github.com:hackforwesternmass/cultural-map

Conflicts:
	Gemfile
	app/models/address.rb
add/use simple_form