further gitflow testing
no message
Revert "no message"

This reverts commit 1e673ca7e343f2f4bd020a41668a63d19f78550c.
Revert "Revert "no message""

This reverts commit 4184f6ec99ae8c312c7403edf068ccb10dd1e149.
Merge branch 'develop'

Conflicts:
	js/Soldier.js
Merge branch 'develop'

Conflicts:
	js/Soldier.js

Current Working copy
Merge branch 'develop'
Fixing a rogue line that wont go away during the merge.
Refactored most of the code,
new object hierarchy,
new objects: playfield, lane and castle.

lanes are now drawn and updated independently of one another.
Soliders now check for collisions only with soldiers in the same lane.

Castles implemented:
Soldiers will fight enemy castles upon collision.
Castles will turn black when reduced to 0 health, but the game continues as if the castle was still there. (this is our win/loss conditional)

Soldier combat fixed:
Soldiers colliding with multiple enemies will now only fight with the first one they encounter.
Soldiers will no longer get stuck if an enemy they were fighting is killed by something else.
Healthbar added to soldiers. (this can be commented out)

Util.js:
Drawlib and vector have been appended to this script to reduce clutter.
no message
Implemented Brian's menu, fixed the introduction screen, implemented play tweaks (Soldiers w/ Weapons move faster to get out of the way, Player is clamped and prevented from moving into the castle.
Added the main menu screen, still needs hooking up
Just the changes i made after our playtest
Moved ryans changes over
Merged to reflect changes
no message
Merge branch 'Refactoring'