Merge branch 'master' of C:\Users\adeboever\Documents\ionic\materialBoy with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	www/css/style.css
results screen changed from cards to list, and displays sunday times in one line.

js added var called sundayStr with list of all  sunday times concatenated