ignore aws
ignore aws.yml
remove database.yml
rm database.yml
remove production.yml
rm production yml
change address
merge ims
change some
change assets host
Merge branch 'ims'
normalize css
Merge branch 'ims'
exclude css
Merge branch 'ims'
fix merge
fix some
fix some bug
fix port
remove pull