Merge branch 'hotfix/git_dist' into develop
Merge branch 'hotfix/back_dist' into develop
Merge branch 'hotfix/delete' into develop
dist edits
Merge branch 'release/0.3'

Conflicts:
	dist/404.html
	dist/index.html
	dist/views/experience.html
	dist/views/guidelines.html
	dist/views/main.html
	dist/views/press.html
	dist/views/registration.html
	dist/views/sponsor.html
	dist/views/team.html
	dist/views/travel.html
	dist/views/volunteer.html