Update on: LAYOUT CHANGES BITCHES

 ´Ô___..___Ô`
Update on: LAYOUT CHANGES BITCHES

 ´Ô___..___Ô`
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/layout/main.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/layout/main.xml
Update on: LAYOUT CHANGES BITCHES

 ´Ô___..___Ô`