Loading from a config file
Merge branch 'master' into config

Conflicts:
	js/main.js
Useful comments
Updated README.md
New pics
Merge pull request #18 from umts/config

Loading configuration settings from url, closes #16