updating 'gh-pages' to mirror 'dev'
updating 'gh-pages' to mirror 'dev'
Merge branch 'gh-pages' of github.com:taitems/jQuery.Gantt into gh-pages

Conflicts:
	js/jquery.fn.gantt.js
	js/jquery.fn.gantt.min.js
updating 'gh-pages' to mirror 'dev'
Syncing gh-pages with master
syncing 'gh-pages' to mirror 'master'
syncing "gh-pages" to mirror "master"
syncing "gh-pages" with "master"
borked merge
updating licensing
syncing "gh-pages" with "master"
syncing "gh-pages" to mirror "master"
mirror
Merge branch 'master' into gh-pages
mirror
fixed incorrect merge
Merge branch 'master' into gh-pages

Conflicts:
	index.html
	js/jquery.fn.gantt.js
mirror
timescale and label changed
removed more html, made the page wider