following pagodabox instructions
all old site minus fanatics
Some syntax fixes
syntax error should be fixed
Added basic skeleton for BMAttackSurrender
* remove orphaned code
small changes to database and added fanatics
Add basic unit tests for BMAttackSurrender
Removed 'Surrender' attack type from BMAttack::possible_attack_types(), so it is not listed in the list of possible attack types
Merge remote-tracking branch 'upstream/master' into 174_surrender
Added basic logic for the effect of a BMSurrenderAttack
* renamed prefs page URL to prefs.html
* added load/savePlayerInfo to dummy_responder and to responder tests
* fixed a bug in which loadPlayerInfo was returning a bunch of extraneous info, including passwords
* added prefs.html to main navbar so people can browse there
* cleaned up syntax/logic of UserPrefs.js to match other JS modules
* added QUnit tests for UserPrefs.js
removed vagrant related files
brought Vagrantfile up to date
hopefully fixed history conflicts
Merge remote-tracking branch 'upstream/master' into fanatics

Conflicts:
	deploy/database/data.button.sql
* actually commit test_UserPrefs.js
fixed some errors in the database
Merge branch 'master' of github.com:buttonmen-dev/buttonmen into 297_completed_games
* add loadCompletedGames to API, and display those games in the overview page
Introducing the Rage Brothers, and trying backslash hashtag for Game Dice