mongodb settings for github
Merge branch 'master' of https://github.com/yellowtrolley/pills

Conflicts:
	pills/src/main/resources/META-INF/spring/database.properties
gitignore and user creation