Cleaning up code.
deleted old files
Deleted deprecated code.
Fixing merge conflicts
Added Oculus Rift lens overlay, re-fixed that scrolling bug that apparently got undone
Merge branch 'dev' of https://github.com/satellite-game/Satellite into dev

Conflicts:
	client/game/styl/s.styl
Merge pull request #240 from steinernein/dev

Cleaning up code.
Quit button on menu now does something (redirects to satellite-game.com)
removed console logs and extra code
Merge branch 'dev' of https://github.com/satellite-game/Satellite into dev
Merge branch 'dev' into minorChanges
Merge pull request #243 from cooperjbrandon/minorChanges

Minor changes
Merge pull request #242 from stites/redis

Redis polish
Merge branch 'dev' of https://github.com/satellite-game/Satellite into dev
Merge branch 'dev' into menu
Gamepads and flight stick now less confusing to use. Credits are now escapable.
Merge branch 'dev' into menu

Conflicts:
	server/events/player.js
Fixed bug where crosshairs got stuck while menu is open
Merge branch 'dev' into menu
Players now forced to turn around when outside map boundary