Changes to be committed:
	modified:   .gitignore
	modified:   README.md
	modified:   hello.py
  THIS IS THE FIRST COMMIT!
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore

	modified:   .gitignore
	modified:   __init__.py
	new file:   user_agent.py
	new file:   user_agent_test.py