-  Markdown styling finished
Merge branch 'develop' of https://github.com/frnhr/miniprint into develop
- UploadView and ProfileView added
Merge branch 'develop' of https://github.com/frnhr/miniprint into develop

Conflicts:
	miniprint/settings_local_empty.py
Added search results
Merge branch 'develop' of https://github.com/frnhr/miniprint into develop

Conflicts:
	web/static/web/css/main.css
	web/templates/web/main.html
	web/urls.py
	web/views.py