test
Merge branch 'master' of https://github.com/anxsaiyuki/r-web

Conflicts:
	db/development.sqlite3