Merge pull request #1 from edamame-course/gh-pages

Merge Branches
Added Tracy's website to index page
added application deadline
Merge branch 'master' of https://github.com/edamame-course/website

Conflicts:
	index.html
Image of Jim Cole
Update Master Branch
Merge branch 'master' into gh-pages

Conflicts:
	index.html