Merge origin/ObjPass into ObjPass

Conflicts:
	src/PHRED2014/PHRED2014.java
Merge origin/master

Conflicts:
	.gitignore