Ghetto ass merging
Merge pull request #11 from cmds4410/Connor

Ghetto ass merging