First commit
Second commit
First branch commit
Second branch commit
Third commit
Merge branch 'v0.1'

Conflicts:
	app.py
	user.py
Third branch commit
Fourth commit
Merge branch 'v0.2'
Fifth ccommit
f
Merge branch 'master' of https://github.com/skilljam/master