initial ui checkin
Merge branch 'master' of github.com:mflesher6/music-hack-day

Conflicts:
	index.html