put setup in main block
Merge branch 'master' of github.com:sontek/notaliens.core
Merge branch 'master' of github.com:sontek/notaliens.core

Conflicts:
	setup.py
add first people, with filled out forms