updates
Merge branch 'master' of https://github.com/sger/sger.me

Conflicts:
	Gemfile.lock