Merge branch 'master' of https://github.com/rreimi/jynx

Conflicts:
	public/css/module.css