projectstate
efforts
register is configurable now
setup doc
setup doc
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
adapted gitignore
Merge remote-tracking branch 'upstream/master'