'Test'
Add getoff.html
Merge branch 'master' into css

Conflicts:
	about.html
	resources/css/styles.css