drafted bootcamp.md to list things we're learning
added items to git list
explanations will go in README
delete..... DELETE
added title
add readme
kill README for serious this time
add something from a cloned repository
Merge branch 'master' of github.com:bdecost/swcarpentry
Merge remote-tracking branch 'upstream/master'
some more things i've learned about git
added date
merged date, updated time
add timestamp
added (wrong) timestamp
timestamp
Resolved local conflicts.