adding jordans shit dont work!
Merge branch 'master' of https://github.com/jackmcgary/eastsidejs

Conflicts:
	week1/index.html