Obrisano
Merge branch 'master' of github.com:matijamatija/first_app

Conflicts:
	app/views/layouts/application.html.erb

Nemam pojma