First import
Add files in .gitignore
Merge branch 'master' of github.com:igoral5/scalc

Conflicts:
	.gitignore