breadsticks make rope work yo
Merge branch 'master' of github.com:cmika/LudumDare2013

Conflicts:
	Library/InspectorExpandedItems.asset
	Library/metadata/12/122fbe86dca784f0698f0dd0c4a4495b
	Library/metadata/13/13114dc6603db419f89578b06af88f1d
	Library/metadata/19/19da761a257d04ad382dbebd7d91d84c
	Library/metadata/21/2121e4669de3c4f4ca15af2df4fa659b
	Library/metadata/24/24081262de9484e1aa4acbacd0ff37d3
	Library/metadata/4a/4a3f1de12cd4d4776a2a1e51d8c4225f
	Library/metadata/4d/4da6e73b120eb4b018cfd02e4c4b84be
	Library/metadata/9d/9de58334af4964dbf9c8292e37634901
	Library/metadata/a3/a39f41010ef1a42258c85d19dcc9a8bb
	Library/metadata/ac/ac945ff613cd543308a0465e3aae965e
	Library/metadata/c6/c6b3e27c844bb44bea089ef1f9c29d87
	Library/metadata/cb/cb0cc73bc43084413abf9ea5dc15b990
	Library/metadata/cb/cbfe22b5139ac4abe854b7c782a14dee
macintosh
fuck git
added things to .gitignore that should have been there from the start
removed said things ignored
Merge branch 'master' of github.com:cmika/LudumDare2013
dropped the roap
crates and anchors
crates and anchors2
crates and anchors3
Robit sees you
it merged

Merge remote-tracking branch 'origin/master' into aa
Robit Animations On Line
Robit has intelligence
Robit seese through walls