config file added
Merge pull request #1 from jesseFC/jesse

config file added
Merge remote-tracking branch 'origin/master' into nick
nicktestcommit via phpstorm