merge confict
Merge pull request #148 from rishy/master

removed merge conflcts from upstream
Merge branch 'KodeKracker-master'