Text updated. Still more to do.

AR-12/4/14
Merged global Text

AR-12/5/14

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

Conflicts:
	education/education/global.R
Fixed Merge hopefully

AR-12/5/14

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

Conflicts:
	education/education/global.R