small refactoring changes
fixing conflict
Merge pull request #37 from JoshuaNotowitz/master

editing project if you made them