Merge pull request #7 from ppatel890/master

Merge pull request #6 from ppatel890/develop
local settings fixed
Merge pull request #8 from ppatel890/newfeatures

local settings fixed
Merge pull request #9 from ppatel890/develop

master up to date