merging
setting gantt chart
merging
adding fonts folder
resolve conflicts
setting index page
Merge branch 'master' of github.com:clojurecup2014/milestones
fix conflicts
setting new style
setting new style
fix clonflict