loading
Merge branch 'master' of https://github.com/zwobbel/Gloss

Conflicts:
	Index.html
	MainController.js
loading