learning paths?
mixins for default page so i can change over to flare
add horizontal rule to globals
begin by adding default.jade to flare
change heading values so they have their own colours [markdown]
changing styles so i can delete unnecessary ones
remove unnecessary classes
space as h4 stopped working
remove landing page index excess styles
git pull
fix merge conflicts
git pull
Merge branch 'master' into 4.0_Flare

starting flare too soon, merge master for consistency
:q

:q

--message "started flare early, merge master for consistency"

:q
q

--message "git merge"

git merge
Merge branch 'master' of github.com:TeamMentor/TM_4_0_Design

another merge
Merge branch 'master' into 4.0_Flare

re-add head.jade back in
re-add head.jade
Merge commit 'ec2ce0e4cb452494f2aa6514809424b1edd5ee19' into Issue_69_Markdown_Friendly
Simple example of the type of conversion and markdown css support that is needed
adding another example (this one will required some css lateral thinking)