Update strings.xml
edit spotify and echonest apis so that they function
separate authentication from MainActivity to prevent overlap
add icons
Merge branch 'master' of https://github.com/sw5813/heartbeat
Merge branch 'master' of https://github.com/sw5813/heartbeat
many attempts at misfit
Merge branch 'master' of https://github.com/sw5813/heartbeat
check for crosses between music dealers and spotify
Change misfit lines to be endomondo in the endomondo file. i copypastaed
Merge branch 'authenticate_endomondo'
master
create EndActivity files
Merge branch 'master' of https://github.com/sw5813/heartbeat
Merge branch 'master' of https://github.com/sw5813/heartbeat
Merge branch 'master' of https://github.com/sw5813/heartbeat
added icons
added finish button and method space for transition
adjusted sizes of icons
add transition to EndActivity