Local.
Merge branch 'master' of github.com:MerreM/JsGrav

Conflicts:
	js/main.js