Merge branch 'gh-pages'
changes the fruit rack test
updated header of download page
add comments, comments out tutorial items
added alcohol to spawn randomly
added varying melee weapons

try them out they are in the tutorial, they might be kinda super OP to
dual wield them, but whatever...
Adding some stuff for companions

Not really done yet, just want to commit
Placeholder for final boss and sets up more rooms.

The rooms are Defended rooms, Labs, and Infected rooms. The final boss
currently is a very strong marine; this will change. There is still no
win condition yet.
Merged and changed labs into bars
Conflicts:
	astro_demo/src/Map.hpp
basic defended room decor

FREE FOOD!
made inner sanctum of defended room
more robust testing system and MLR's in rooms
the pallets aren't empty...
minor changes
finalizing defended rooms
adds defended room stable lighting
Adds key system, menu to be modified
Adds More Titanium armors
Vaults drop artifacts, modify what they drop in Map.cpp generateRandom
Merge remote-tracking branch 'origin/master'