stash 1
Merge branch 'master' of https://github.com/wyliethomas/geomaticly_client

Conflicts:
	app/models/geomaticly.rb
	config/config.yml