Merged and fixed post merge errors.
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/home.ejs