add homepage
add padding in header
Merge branch 'add-homepage'

Conflicts:
	Gemfile
	Gemfile.lock
resolution conflict