df
Merge branch 'anx' of https://github.com/anxsaiyuki/r-web
Merge branch 'anx' of https://github.com/anxsaiyuki/r-web

Conflicts:
	db/development.sqlite3 j#
daf
Merge branch 'master' of https://github.com/anxsaiyuki/r-web into anx

Conflicts:
	db/development.sqlite3