init
added public/dist directory
modified css and html structure
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	public/dist/favicon.ico
	public/dist/index.html
	public/dist/views/about.html
	public/dist/views/main.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	public/dist/favicon.ico
	public/dist/index.html
	public/dist/views/about.html
	public/dist/views/main.html
update
update
fixed dev mode
check push
fix git commit
modified theme
added Guice module
modified Guice integration and added error management for 404 and 500 codes
Merge https://github.com/broxmik/showcase-roxana-bajan