Basic Security
Merge branch 'master' of https://github.com/badamowski/DSMHack

Conflicts:
	app.js