Consolidated code
Consolidated code
Consolidated code
Merge remote-tracking branch 'origin/master'
Got rid of PyCharm config files
Got rid of PyCharm config files
Minor comment fixes
Merge pull request #6 from HEdingfield/master

Consolidated code