adding basic settings
js assets created
Definition of uglify to generate all in one
Merge remote-tracking branch 'origin/master'

Conflicts:
	package.json
	test.html