blah
Merge branch 'master' of github.com:T4All/EggJog

Conflicts:
	www/scripts/scripts.js
updated gitignore
removed www