added converter
added cgi
Merge branch 'master' of https://github.com/santi-grau/a2

Conflicts:
	public/css/main.css
	public/css/main.styl