Revert "Separated Javascript and CSSfiles"

This reverts commit be725c616cfddb1aae7cf4615c73aaff9531f1ea.

Conflicts:
	views/base.ejs
	views/functions.js