fixed actorstate and started canvas
fixed GridSquare and canvas wip
drawing all objects
Merge branch 'master' of https://github.com/als364/Rain-On-Your-Parade

Conflicts:
	Rain On Your Parade/Rain On Your Parade/GridSquare.cs
	Rain On Your Parade/Rain On Your Parade/WorldState.cs
mergeing
finished adding objects and actors to Canvas grid
Merge branch 'master' of https://github.com/als364/Rain-On-Your-Parade
drawing actors/objects
drawing actors
updated gridsquare coordinates in canvas
conflicts fixed
actor.xnb  now exists
actor.xnb  now exists
minor fixes
fixed actor image content load
fixing merge conflict
Finished ActorController