merge
Merge branch 'master' of https://github.com/Caspinol/catdamnit

Conflicts:
	app.js
	package.json
	routes/index.js
	views/index.ejs
Started adding uthentication and user login