omg
transitions
scroll javascript
Merge branch 'Home'

Conflicts:
	css/style.less
	img/hexa.png
	index.html