code merging
test app
test app
added tracker