Integrating and unifying changes from multiply sizes
Merge branch 'master' of https://github.com/Zelnor/FASTAcalc
Conflicts:
	.gitignore