Adding album model
Adding album model
Adding album model
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	MironSite/settings.py
	miron_static/css/master.css
	templates/base.html
	templates/contacts/contacts.html
	templates/links/links.html
	templates/notes/notes.html
	templates/services/services.html
Adding album model
Adding album model
Adding album model