Tests
Merge branch 'master' of https://github.com/ltomaszewski/Amaro

Conflicts:
	Podfile