comment out rack error statement
resolve merge conflict
edit rebase out of git script
add in project and site.all
add in project and site.all
add in project and site.all
strip whitespace
strip whitespace