Initial commit of apptrack
Merge remote and local