Merge branch 'master'

Conflicts:
	src/lib/api.js
	src/pages/ask.js
	src/pages/index.js
	src/pages/questions/ask.js