incorporated theme
Merge branch 'master' of https://github.com/willeexl/mybackup

Conflicts:
	Gemfile.lock