final shit
Merge branch 'master' of https://github.com/kairusso/Beta_site

Conflicts:
	EXTERNAL/about.html
	EXTERNAL/index.html