Merge branch 'master' of github.com:cg123/LudumDare26
Added basic environment. Test without rift.