combined repo containing rails/html work