precache beginning
add banner
merge resolve
Merge branch 'master' of github.com:joshma/astoria
Merge branch 'master' of github.com:joshma/astoria