header and footer design
Merge branch 'master' of https://github.com/udobu/udobu

Conflicts:
	udobuApp/Gemfile
	udobuApp/Gemfile.lock