Meteor stuff
Merge branch 'master' of https://github.com/ClockworkPirate/Big-Hack-Plays-2048

Conflicts:
	js/command_buffer.js
	js/game_manager.js
...