merging
Merge branch 'master' of https://github.com/mrpoor/pocketwingman
merging
merging
Merge branch 'master' of https://github.com/mrpoor/pocketwingman

Conflicts:
	.idea/workspace.xml