made miniscule changes
merge branches FREAK OUT! 10/23 ER SL

Merge branch 'gh-pages' of https://github.com/sEigmA/SEIGMA into gh-pages

Conflicts:
	divorce/marriage2/server.R