handled conflict
added links
conflicts merged
Merge pull request #149 from nickpassarella/master

merging kheang's code