content
content2
content

Conflicts:
	content/faculty/faculty_eng.md
	content/sidebar/graduates.md
	media/css/custom.css
	media/img/headers/en/applicants.jpg
	media/img/headers/en/faculty.jpg
	templates/base.html
	templates/main.html
	templates/widgets/1september_banner.html
	templates/widgets/23february.html
	templates/widgets/banner_feb.html
	templates/widgets/december_banner.html
	templates/widgets/mister_bseu.html
	templates/widgets/students_day.html
	templates/widgets/teachers.html
	templates/widgets/valentines_day.html
Merge remote-tracking branch 'origin/master' into updated-content

Conflicts:
	content/applicants.md
	content/contacts.md
	content/departments.md
	content/departments/departments_agricultural_economics.md
	content/departments/departments_economic_cybernetics.md
	content/departments/departments_economic_informatics.md
	content/departments/departments_environmental_economics.md
	content/departments/departments_industrial_economics.md
	content/departments/departments_labor_economics.md
	content/departments/departments_national_economy.md
	content/departments/departments_organization_and_management.md
	content/faculty.md
	content/faculty/faculty_dean.md
	content/other/article1.md
	content/other/article17.md
	content/other/articles.md
	content/science.md
	content/science/department_science.md
	content/science/student_science_organization.md
	content/sidebar/applicant_links.md
	content/sidebar/brsm_lead.md
	content/sidebar/brsm_links.md
	content/sidebar/council_invitation.md
	content/sidebar/council_lead.md
	content/sidebar/dispensary_professional_union.md
	content/sidebar/graduates.md
	content/sidebar/professional_union_lead.md
	content/sidebar/student_links.md
	content/sidebar/student_science_actual.md
	content/sidebar/student_science_conf.md
	content/sidebar/student_science_links.md
	content/sidebar/student_science_misc.md
	content/sidebar/student_science_snil.md
	content/student.md
	content/student/student_brsm.md
	content/student/student_council.md
	content/student/student_professional_union.md
	media/css/custom.css
	media/js/newsfeed.js
	templates/base.html
	templates/main.html
	templates/widgets/80_years_banner.html
	templates/widgets/news_widget.html
	templates/widgets/teachers_banner.html
	templates/widgets/twitter_widget.html
	templates/widgets/twitter_widget2.html
	templates/widgets/vk_group.html
Regular style fixes
Merge pull request #4 from stachern/updated-content

Update content eventually
Create README and add info on contribution
Add info on branch rebasing
Add a site map widget
Add draft sitemap page
Hardcode sitemap tree structure