Merge pull request #1 from connorclockwise/master

FORGIVE ME IF THIS KILLS IT
Merge pull request #9 from captaincrutches/master

oh god how did this get here i am not good with computer