WIP
Merge branch 'master' of github.com:espringe/moneypot

Conflicts:
	views/faq.html