test commit
Merge branch 'dev-akarpins' of https://github.com/nsu/blagtest into dev-swittli2
Merge branch 'dev-akarpins' of https://github.com/nsu/blagtest into dev-swittli2
add sqlite to gitignore
Merge branch 'master' of github.com:nsu/blagtest into dev-akarpins
added skeleton for url patterns
Merge branch 'master' of https://github.com/nsu/blagtest into dev-kgerami

Conflicts:
	.gitignore
	blagtest/urls.py
	core/views.py
URL Calculator created