change settings
merge conflicts
add blank url
Merge pull request #9 from mirthbottle/master

change settings to fix site