we will see??
Merge branch 'master' of https://github.com/rybotron/TribecaTWDHack

Conflicts:
	js/resourceLibrary.js