added a bunch of stuff and fixed return issue
fixed conflicts
Merge branch 'master' of github.com:tabishiqbal/ToolHero2