Merge branch 'master' of https://github.com/jakubzet/webd.git into Programmer
Nowy kommit
Hehehe2!
Zmiana kolejkna
asa
Merge branch 'programmer'

* programmer:
  asa
  Zmiana kolejkna
  Hehehe2!
  Nowy kommit

Conflicts:
	javascripts/scripts.js