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

Conflicts:
	templates/index.html