Merge branch 'master' of https://github.com/georgekick/misc
namespace

Merge branch 'master' of https://github.com/georgekick/misc

Conflicts:
	NAMESPACE