Commit before pulling.
Fix merge conflicts.
Merge branch 'master' of https://github.com/red-spotted-newts-2014/haunted
clean up a little
comment out function for collision handler
Merge branch 'master' of https://github.com/red-spotted-newts-2014/haunted
Merge branch 'master' of https://github.com/red-spotted-newts-2014/haunted
delete ds store
Merge branch 'master' of https://github.com/red-spotted-newts-2014/haunted
Merge branch 'master' of https://github.com/red-spotted-newts-2014/haunted
Merge pull request #66 from rootulp/master

merge everything
Merge branch 'master' of https://github.com/red-spotted-newts-2014/haunted
Merge pull request #67 from cassiemoy/master

Actually merge everything.
put createBoard into board namespace
create board pieces now belong to board namespace
delete game pieces.js
delete require game_pieces.js
move vex js into vendor folder
Move vex to vendor and change paths in application.html
Rename one_wall to sandbox and change routes/paths. Add main.js to  precompilation of assets."