zodiac
Merge branch 'master' of github.com:mattmarcello/class_proto

Conflicts:
	class_arr.rb
zodiac