Begin merging old ruby project with new angular project
Finish basic merge of old/new thedeli projects