commit before merge
Merge branch 'master' of https://github.com/hamisto27/wis-project-1
jqcalendar works
Merge remote-tracking branch 'origin/master'