update gitignore
add Procfile
admin redirect pathc
merge conflcist