Skeleton for the app
Fixed some minor remote local conflicts