Added link to etherpad
Added room number
Merge branch 'gh-pages' of github.com:abostroem/2015-01-03-aas into gh-pages