Merge pull request #1 from FelixTurtur/nick

Nick's Work
Merge branch 'nick'
Remove out directory (binary output)
Exclude out/ directory
Reformat code
Workspace file should not be versioned - http://devnet.jetbrains.com/docs/DOC-1186
Abbie catchup
Hourly Commit

Mainly spacings
Container not Canvas

Switched Artist to inherit from container rather than canvas. Added a
title too.
Replacing Canvas concepts with Container

And added a pretty picture
Altered drawBone

drawBone now considers player type. Was going to do this via "isHuman"
function, but that can't be done. Still, I like my detectLifeform
method, so I'm leaving that in for giggles.
Have also dropped TODOs here there and everywhere.
Merge pull request #2 from FelixTurtur/abbie

Small changes made whilst thinking about introducing GUI interactivity.
Merge remote-tracking branch 'origin/master' into nick

Conflicts:
	.idea/workspace.xml
hopefully with the merges...