merge
Merge branch 'master' of https://github.com/arianimartins/StarCard

Conflicts:
	.idea/libraries/appcompat_v7_19_1_0.xml
	.idea/libraries/library_1_1_2.xml
	app/app.iml
	build.gradle
	gradle/wrapper/gradle-wrapper.properties