Added shield
Merge branch 'master' of https://github.com/brycekahle/gpp

Conflicts:
	2014/public/js/game.js
Merge branch 'master' of https://github.com/brycekahle/gpp

Conflicts:
	2014/public/js/game.js
add randomness
Merge branch 'master' of https://github.com/brycekahle/gpp

Conflicts:
	2014/public/js/player-ship.js