implement SPR1-2 with initial tests and config
merge from SPR1-1
Merge branch 'master' of https://github.com/borya09/whoru

Conflicts:
	README.md
	app/index.jade