clean conflict
Merge branch 'master' of https://github.com/Reiko-JS/JavaScript-UI-and-DOM-2014-Teamwork

Conflicts:
	FruitNinja/Skeleton/scripts/Models/FruitFactory.js