asdfadf
Merge branch 'master' of github.com:danicheman/miami-joe-or-brew
asdfsd
Merge branch 'master' of github.com:danicheman/miami-joe-or-brew
asdfasdf:wqMerge branch 'master' of github.com:danicheman/miami-joe-or-brew

Conflicts:
	script.js