removed .git
making sure addition is such that a conflict arises later
final edits and a little pep8
Merge pull request #103 from gidden/collab-edits

Looks good to me