birthday
"durrr"Merge branch 'master' of github.com:mattmarcello/class_proto

Conflicts:
	class_arr.rb
merge conflicts resolved
'merge,Merge branch 'master' of github.com:mattmarcello/class_proto
'merge/
Merge branch 'master' of github.com:mattmarcello/class_proto
'merge'
Merge branch 'master' of github.com:mattmarcello/class_proto
Merge branch 'master' of github.com:mattmarcello/class_proto