adding functionality
adding lines at the end
Merge branch 'master' of https://github.com/prakharjoshi/pycon.gj into prakharjoshi-master

Conflicts:
	templates/index.html
Merge branch 'prakharjoshi-master'