asdf
ignore translations
asd
fuck u
efsafsdafawe
Merge branch 'master' of github.com:mytcg/GameCardsBB10
Merge branch 'master' of github.com:mytcg/GameCardsBB10
Merge branch 'master' of github.com:mytcg/GameCardsBB10

Conflicts:
	SurfingSADev/assets/Card.qml
	SurfingSADev/src/SurfingSADev.cpp
Merge branch 'master' of github.com:mytcg/GameCardsBB10

Conflicts:
	SurfingSADev/assets/AlbumView.qml
	SurfingSADev/assets/Card.qml
pages