i kkkj
actually committing things
Merge branch 'master' of https://github.com/DataMap13/DataMap

Conflicts:
	vermont/db_config.xml