Potions spin now!
Merge pull request #6 from shiyingzheng/master

Potions spin now!
did some stuff. Time to merge?
Merge branch 'master' of https://github.com/benjaminpstern/AlphaBuild

Conflicts:
	Assets/Resources/Prefabs/Wall Tile.prefab
scene 8
Merge branch 'idleBehavior'
bug fix
added a level
Zoomed out more because of bigger maps
Merge pull request #7 from shiyingzheng/master

Zoomed out more because of bigger maps
This is actually fixing the camera frame size
I don't know what these guys did on my computer
Fixed minor things like wall tiles and light towers
Made a minimap camera prefab
Merge pull request #8 from shiyingzheng/master

This is actually fixing the camera frame size
Added lights and toggle minimap on/off
Added bling sound for picking up objects
Merge pull request #9 from shiyingzheng/master

Added lights and toggle minimap on/off
IM A GOOFER GOOBER YEAH
Merge remote-tracking branch 'upstream/master'