Updating my master to match the upstream before today
Took out the ssh stuff in the gitconfig
Remove the .idea directory
Remove the .idea directory
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/develop' into develop
Merge branch 'develop'
Merge pull request #6 from bcarroll22/master

Merge readme