Deleted app.js
Merge branch 'master' of https://github.com/Arknium/inpno

Conflicts:
	js/app.js