before saving to branches
Merge remote-tracking branch 'origin/test' into test

Conflicts:
	PalindromicPrime/src/PalindromicPrime.java
Merge pull request #4 from camensah/test

before saving to branches