add assets
Merge branch 'master' of https://github.com/ted-hanson/roomr
update home
home merge