test
Merge branch 'master' of github.com:shrek82/gobiker

Conflicts:
	study/.idea/workspace.xml