update codeResult.ftl
Merge branch 'master' of https://github.com/Shufeng01/WishPal

Conflicts:
	src/main/resources/spark/template/freemarker/codeResult.ftl
add heroku postgresql conn
clear pics
add a pic