Updating levelgen.cpp to standard || and && or/and operators.
Merge branch 'master' of https://github.com/conanc2c/dangerous-headbutt
Merge branch 'master' of https://github.com/conanc2c/dangerous-headbutt
Simplifying Camera usage (storing player reference as a member instead of requiring it to be passed in as a param).
Merge branch 'master' of https://github.com/conanc2c/dangerous-headbutt

Conflicts:
	main.cpp
Fixing casting warnings in main.cpp