merging cody files
merge conflicts
Merge pull request #7 from aktse/master

resolved merge conflicts