added mason's name
Merge branch 'master' of https://github.com/maswhitaker/class-website into maswhitaker-master

Conflicts:
	README.md