I want to be the very best
fix merge conflicts
Merge branch 'callmehiphop-master'