Merge branch 'frontend' of github.com:neofu50/poverty

Conflicts:
	poverty.go
Merge branch 'frontend' of github.com:neofu50/poverty

Conflicts:
	poverty.go
Update README.md
Update README.md
merged