haha
Merge branch 'master' of https://github.com/dtklinh/master-project

Conflicts:
	src/Components/MyBlackbox.java
	src/Support/StaticSupportMethod.java
	src/getproteinname/GetProteinName.java