Updated scholarship poster and date (1May) again
Merge branch 'master' of https://github.com/columbia-egsc/columbia-egsc.github.io

Conflicts:
	scholarship.html