Hide sublime configs
Merge branch 'master' of github.com:Hephistocles/mabel
Merge branch 'master' of github.com:Hephistocles/mabel
Add string parameters to getString, and add jshint annotations
Merge branch 'master' of github.com:Hephistocles/mabel

Conflicts:
	app.js