no message
Merge branch 'master' of https://github.com/TkachenkoRoman/Lab3

Conflicts:
	.idea/workspace.xml
	guitar_app/models.py
	guitar_app/models.pyc
	guitar_app/tables.py
	guitar_app/tables.pyc
	guitar_app/urls.pyc
	guitar_app/views.py
	guitar_app/views.pyc