marking end of file
introducing function with an argument
introducing feature 3
Merge remote-tracking branch 'upstream/master'
Merge branch 'RFE1' of github.com:tlestach/spacehub into RFE1

Conflicts:
	code.py
Merge pull request #7 from tlestach/RFE1

introducing feature 3