*.dsk в игнор
Merge branch 'master' of github.com:budzilo/datacash

Conflicts:
	Calculator.dsk
Merge branch 'master' of github.com:budzilo/datacash
Merge remote-tracking branch 'remotes/datacash/master'
Исключил лишние файлы
xxx
xxx