New readme changes
Site deploy
Updated htaccess
Updated htaccess to default settings
Added features
Updated gitignore
Fixed merge