Merge pull request #176 from KodeKracker/master

deleted unused code
pushed some random changes
fixed issue with chrome
Merge pull request #177 from rishy/master

fixed issue with chrome
deleted unused files