Cleaned out files changed todoApp to serveryApp
Merged files