previous day's work
Merge branch 'master' of
https://github.com/karenhovhannisian/iguan_tracker.git

Conflicts:
	src/main/java/com/webwork/main/runnable/TrackerBackground.java
	src/main/java/com/webwork/model/Tracker.java
new
merge
Merge branch 'master' of
https://github.com/karenhovhannisian/iguan_tracker.git

Conflicts:
	src/main/java/com/webwork/model/Tracker.java