finishing
Merge branch 'master' of https://github.com/karenhovhannisian/iguan_tracker.git
final fix