merged readme changes?
fixing files for merge?
Merge branch 'gh-pages' of github.com:swcarpentry/2014-04-14-wise into gh-pages
Merge branch 'gh-pages' of github.com:swcarpentry/2014-04-14-wise into gh-pages
changed nano to vim and made the bottom git command command type text.
changed header in intro, using the thw version of what comes next instead of what was here before - starting to modify now.
updated through creating mars.txt
finished updating git local section; changed wolfman to wolfwoman, vlad to viorica, and nano to vim.
removed the conversational-git file I'm not using, and added the file for the git remote section - updated the index accordingly.
making progress in git remote lesson. Changing all examples to be for jelly bean code.
finished updating git remote; kept Bk example as an example. Jelly bean code should be ready to go.
initial materials for py-classes; copied from lessons/thw-python/obj-orientation
changed vim back to nano. oops.
modified classes notebook, moved all class materials into the main python folder, and made the notebook a master version.
added the student version of the classes notebook; moved the git index to the readme to make more sense.
example of oop things for students to work on if they want to.
removed class stuff I don't need.
Merge branch 'gh-pages' of github.com:swcarpentry/2014-04-14-wise into gh-pages
Merge branch 'gh-pages' into slaybaugh
changes some apostrophes and makes them tildes, for rendering properly.