changed some things with the layout
Merge branch 'master' of https://github.com/Bandits789/WhatSongIsItAnyway

Conflicts:
	res/layout/activity_main.xml