temporaryily replacing public files with landing page
bundled foundation and added respective gems
ads pg and thin back to gemfile for production
' removes tmp direction ''
removes log and database from git... these shoudl not be in git
resolves merge conflicts.. takes dbs and logs out of git