Provide solution for issue #2
Merge branch 'master' of github.com:karasik/fresh-quests-summer

Conflicts:
	macros/main.cfg
Small changes