p1 done
Added python p1 alternatives
Merge branch 'temp'

Conflicts:
	python/p1.py
	scala/p1.scala