gitignore file for Ankoors version
nothing changed
Merge branch 'development' of github.com:AdamGoodApp/cheerup into development

Conflicts:
	.gitignore
	log/development.log
	tmp/pids/server.pid