modified:   PowerUp/.DS_Store
	.DS_Store
	.idea/
	PowerUp/src/.DS_Store
	PowerUp/src/main/.DS_Store
	PowerUp/src/main/res/.DS_Store
	PowerUp/src/main/res/images/
Merge branch 'master' of https://github.com/Celor251/PowerUp2