Before merging with fetch
Don't really know what's happening here.
Merge branch 'master' of https://github.com/JackCassidy/UB5

Conflicts:
	.idea/UB5.iml
	.idea/dataSources.ids
	.idea/dataSources.xml
	.idea/workspace.xml
Got rid of .idea in repository
parse_dataline method, and some tests in peptide_spec.rb
merged .gitignore