Merge pull request #1 from ellMathur/master

something
changed charmaine to something nice
Merge pull request #3 from xizzles/master

changed charmaine to something nice