modifications
modifications
Merge branch 'master' of https://github.com/Kylesky/CHI-Crossings into kyle
removed misplaced resources