merge
Merge branch 'master' of https://github.com/11693-5/project-team05.git

Conflicts:
	project-team05/src/main/java/edu/cmu/lti/f14/team05/BioConsumer.java
Merge pull request #5 from 11693-5/freddiez

initialize
remove other types than question
fix consumer abort bug
1
Merge branch 'master' of https://github.com/11693-5/project-team05.git

Conflicts:
	project-team05/.classpath
update gitignore
Merge branch 'master' of github.com:11693-5/project-team05
classpath
Merge remote-tracking branch 'origin/master'

Conflicts:
	project-team05/.classpath
classpath
Merge branch 'master' of https://github.com/11693-5/project-team05.git

Conflicts:
	project-team05/.classpath
ignore classpath
Edit Descriptors
remove classpath and report from git
fix bugs

fix descriptor relative path bug
exclude /bin
+ parameter to collection reader
fix collection reader dead loop bug
ignore output

ignore all txt files
descriptor
22