Merge pull request #14 from jpwhitaker/dev-no-board

WIP backbone views with kineticjs
added team and id in Piece
Updated svg's to be flat bottom hexes
Added png's of tiles, moved svg's to new folder
Updated some docnames & added newlines to EOF
Merge pull request #15 from Whoaa512/dev-no-board

Added PNGs, updated SVGs
WIP: added view and collections files
Merge branch 'dev-no-board' of github.com:junejung/Hive into dev-no-board
Added bootstrap
Merge branch 'dev-no-board' of https://github.com/junejung/Hive into dev-no-board

Conflicts:
	app/public/js/require-config.js
Semi-WIP: Merged upstream, fixes on Piece logic.

This commit represents a lot of work on the Piece model; lots of generalizable
piece logic has been moved onto Piece, tests have been written for existing
functionality, and lots of existing but broken functionality has been fixed.
Merge pull request #16 from Whoaa512/dev-no-board

Added bootstrap
Clarified test boilerplate block
Merge remote-tracking branch 'upstream/dev-no-board' into dev-no-board

Conflicts:
	app/public/js/models/Queen.js
	app/public/js/require-config.js
	spec/specs/clientSpec.js
Added the instructions modal
Merge pull request #18 from Whoaa512/dev-no-board

Added the instructions modal
Fixed some upstream incompatibilities; tests do not run at present
Merge pull request #17 from ndhoule/dev-no-board

General fixes on board piece logic
Removed craftyjs file from vendor, updated Queen
Merge pull request #19 from Whoaa512/dev-no-board

Removed craftyjs file from vendor, updated Queen