Update to latest rust
Merge branch 'master' of github.com:am0d/rust-web

Conflicts:
	src/static_controller.rs