merge confict
Merge branch 'KodeKracker-master'
Merge pull request #149 from rishy/master

removed merge conflcts from Kodekracker