Merge branch 'feature-footer' into dev
more lorem ipsum
Merge branch 'release-1.0' into dev

Conflicts:
	index.html
Merge branch 'dev' into feature-footer
adding more to footer menu items
removing footer title