Added deploy patch
Added deploy patch
Merge branch 'deploy' of http://github.com/cjpatton/seaice into deploy
Added deploy patch
Merge branch 'deploy' of http://github.com/cjpatton/seaice into deploy
Changed some variables for Camp-4-Data testing.

Prototype testing scheduled for 10/2/13, 13:45 EST. Changed
stbailityInterval to 1 hour and MAX_CONNECTIONS to 18.
Reputation seeded to 30 for all users.
Added deploy w/ keys patch
Make trivial change in About text to test deployment procedure.
Merge branch 'master' of heroku.com:seaice
Merge remote-tracking branch 'upstream/master'
Trivial change to test deployment.
Change SeaIce to YAMZ in About page.
Change SeaIce to YAMZ in HTML templates.
Fix minor spelling error (testing heroku deployment).
typo
dropped word to prevent line wrapping
Merge branch 'master' of heroku.com:yamz

Conflicts:
	html/templates/index.html