10/15
changed .gitignore
Update .project
Merge remote-tracking branch 'upstream/master'
added vanessa's stuff
added vanessa's stuff
updated readme
added readme markdown syntax
edited readme markdown
Merge pull request #8 from gjhiggin/master

Version .4