Initial commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
clearing the repo
base
base
fucking base
sfx folder added and splash sound placed in it
added more sounds
Added objectFactory to create bodies & joints
Fixed an error in ObjectFactory
Added angled platform
Fixed all errors
Added Basic Platforms
fixed code, dlls included
merged menu
Player class added - Conor
Added spinning windmill box2d body
merged more stuff
Merge branch 'master' of https://github.com/GavinClarke/GameCraft2014TaxesPlease
Updated a parameter