updates
updates
updates
Merge branch 'master' of https://github.com/pacikav/alt-od.com

Conflicts:
	css/style.css