Solved 134
Added prime seive
fixed conflict
Merge branch 'master' of https://github.com/frrad/project-euler

Conflicts:
	euler/numbertheory.go