Merge branch 'master' of https://github.com/matthewstrickland22/class.js

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/matthewstrickland22/class.js