Merge branch 'master' of https://github.com/mlfaulk/repo

Conflicts:
	fast.class
not sure
1121