Merge branch 'master' of https://github.com/jimianellil/SurveyAverage

Conflicts:
	code/re.tpl
	code/run.bat
	readme.md
Fixed re.tpl