Add software workshop notes
Merge branch 'master' of github.com:joshaw/joshaw.github.com
Removed residule conflict file
Bullet points indentation reduced one small screens
Add more notes
move to kramdown