commit before pull
Merge branch 'master' of https://github.com/Baloche/ns

Conflicts:
	app/cache/acl/data.txt
git ignore