features added
Merge branch 'jasonk54' of https://github.com/jasonk54/OpenRecess into jason

Conflicts:
	public/js/collections/Games.js
Merge branch 'jason' into 3divs-dev