Code flying from the fingertips
Merge branch 'master' of https://github.com/schematical/njax

Conflicts:
	public/js/directives.js