testing about us on mobile
Merge branch 'master' of https://github.com/asmockler/asmockler.github.io

Conflicts:
	js/index.js