latest changes
Merge branch 'master' of https://github.com/Sanatrath/got-merged

Conflicts:
	views/test.ejs