Commit before pulling.
Fix merge conflicts.
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 branch 'master' of https://github.com/red-spotted-newts-2014/haunted
changeMusicVolume taken out of the create function to make the game run again
Merge pull request #65 from sidpatel13/working_copy

changeMusicVolume taken out of the create function to make the game run ...
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."
remove unnecessary if else logic from application.html.erb and include home js in home view and main js in show view
move images into subfolder images in public