added the htmpl_test image
added "kon"
Merge branch 'master' of https://github.com/vgrozev/SoftUni_WebProject_Sep2014
added the jokes section to the version 3 html
Merge branch 'master' of https://github.com/vgrozev/SoftUni_WebProject_Sep2014