awesome stuff
Merge branch 'master' of github.com:burner/Sandbox

Conflicts:
	uniformAccess/Makefile