all files taken from a previous spike branch that ended up becoming my main branch
Merge pull request #1 from NathanSass/mastercommit

all files taken from a previous spike branch that ended up becoming my m...