delete one_wall testing file
delete comments in application.js file
Merge branch 'master' of https://github.com/juljun14/haunted
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
comment out borders because borders make map look bad
Merge pull request #59 from juljun14/master

Commit to latest master