friday update
friday fixs
Merge branch 'master' of https://github.com/hartey11/profusion

Conflicts:
	css/version_2.css