settings updated
login
Merge branch 'master' of https://github.com/pratheekms/cfg14

Conflicts:
	frontend/edit.html