Merge pull request #3 from xizzles/master

changed charmaine to something nice
this is sparta
Merge pull request #2 from ellMathur/master

tara katrina