Merge da master
Edits for the update
Solo un piccolo cambiamento
Merge branch 'master' into add-export
Merge branch 'master' into add-export

Conflicts:
	js/WHIB.js
Merge branch 'master' into add-export
Merge branch 'master' into add-export
Merge branch 'master' into add-export
Merge branch 'master' into add-export

Conflicts:
	js/WHIB.coffee
Forgot the Actually edited file.
Merge branch 'master' into add-export
Merge branch 'master' into add-export

Conflicts:
	js/WHIB.coffee
Merge branch 'master' into add-export
Export view went away somehow
Merge branch 'master' into add-export
Merge branch 'master' into add-export

Conflicts:
	index.html
	js/WHIB.coffee
Merge branch 'add-export' of github.com:minkiele/WHIB into add-export
Merge branch 'master' into add-export

Conflicts:
	js/chronicles.coffee
Merge branch 'master' into add-export
Edited to support globals