following pagodabox instructions
all old site minus fanatics
Some syntax fixes
syntax error should be fixed
* remove orphaned code
small changes to database and added fanatics
* 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
Merge pull request #373 from cgolubi1/101_prefs_ui

various code and test fixes for UserPrefs.js
Merge pull request #375 from cgolubi1/297_completed_games

restore completed games to overview page
fixed trouble with trouble recipe
Merge pull request #368 from ManvilleFog/fanatics

Fanatics