Merge branch 'master' of https://github.com/bhorsa/primer_gen

Conflicts:
	primer_gen.py
Removing merge errors

after merge, some random lines were added. removed these.
test

test