Merge pull request #4 from yusuftor/master

getting yusufs stuff
Ross is an idiot
theta attempt 1
Merge pull request #16 from TCollier92/master

theta v 1
Merge pull request #6 from yusuftor/master

gshagdhbmmxcz