UI updated
Merge branch 'master' of https://github.com/akankshajoshi/gogreen

Conflicts:
	templates/home/home.html