commit conflict
Merge branch 'master' of github.com:draedful/look-at-me
Merge branch 'master' of github.com:draedful/look-at-me
Merge branch 'master' of github.com:draedful/look-at-me
test
Merge branch 'master' of heroku.com:frozen-crag-3424
delete 2 files
Enctrance to the room
enctrance the room. Fix index view
config privatePub and other