Merge branch 'master' of https://github.com/Dylan1312/farsetlabs.github.io

Conflicts:
	about/getting here.md
gettinghere.md