Merge branch 'dualcolor'
Merge branch 'master' of https://github.com/shivawu/topcoder-greed
Merge pull request #105 from vexorian/htmloptions

Add problem statement template options. Fix issues with multiline args.
Merge branch 'master' of https://github.com/shivawu/topcoder-greed

Conflicts:
	src/main/resources/default.conf
Remove darkgrid template. Cool problemdesc defaults.