poprawka w kontrolerze
Merge branch 'psuminski'
layout
Merge branch 'master' of https://github.com/zarie/apka

Conflicts:
	db/seeds.rb
Merge branch 'psuminski'
font-awesome
Delete bootstrap.min.css
heroku
heroku
Dzielenie sie zamowieniami - tworzenie zaproszen.
row fix
Merge branch 'master' of github.com:zarie/apka
ocenki
Merge branch 'master' of https://github.com/zarie/apka into mikolaj