ignored public/assets because of phusion passenger
Merge branch 'master' of github.com:ruiyangliu/ruiyang.ca