Added leonard center
Merge remote-tracking branch 'origin/dev' into dev
Added the LC
Started adding the plot to the text file
Fixed a bug with SpriteUitls split methods, and moved all the stuff from the plot to a temp file until we get around to finishing it
test
test
comments
dumb stuff
dumb stuff
Merge remote-tracking branch 'origin/battle' into battle

Conflicts:
	SuperMacalester.iml
dumb stuff
dumb stuff
merged with master
Updated Leonard Center, Added Kirk as well as a sidewalk tile, fixed beardguy canvas to one less animation frame
Merge remote-tracking branch 'origin/dev' into dev
Updated Leonard Center, Added Kirk as well as a sidewalk tile, fixed beardguy canvas to one less animation frame
Adding the plot to plot_temp.txt file, hopefully for use tomorrow in class
Updated parser info
Added an attach(InteractionBuilder) method to Interaction, to make combining two interactions easier.
Added a boolean "delay" to the goal class, which determines whether the NPC should be removed immediately or delayed
Updated the delay code in Entity:
Methods are now removeFromGrid() and changeGrid(destination), with optional parameter boolean delay, which if true causes a delay.
changeGrid(destination, forced) has been renamed forceChangeGrid, and the boolean has been removed; it instead necessarily forces the change
changeGrid() has also been renamed forceChangeGrid
fixed a mistake in the plot
Updated the world around the addition of Kirk. Also replaced most cobble with sidewalk.
Loaded Kirk and Asteroid into Map/AssetLoaders
Tiles now hold animations, rather than TextureRegions.  Code has been adjusted appropriately