Using web server now
Merge branch 'master' of github.com:sendwithus/flipzies

Conflicts:
	flipzies.go
	src/main.jsx
	static/index.html
	static/js/main.js
Merge branch 'master' of github.com:sendwithus/flipzies