Added in bg lines and attempt at post processing (not yet working).
resolved merge conflicts with main.js and threeSystem.js when merging in floor.
Adding missing font reference to css
Merge remote-tracking branch 'remotes/origin/master' into michaelskiles
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# Explicit paths specified without -i nor -o; assuming --only paths...
# On branch michaelskiles
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	modified:   styles.css
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	../.idea/
Merge branch 'master' of https://github.com/archcomet/IndecisiveGGJ2014 into michaelskiles
Added materials for enemies and changed room lighting.
First pass of visuals.
Merge branch 'master' into materials
Changed the promptSystem text bounds to not go as high and stay below the walls.
Merge pull request #11 from archcomet/michaelskiles

Michaelskiles
Merge pull request #12 from archcomet/louiscarl

Louiscarl
Merge pull request #13 from archcomet/materials

Materials
Form to change name. Changed names.