updated ww2.fredonia.edu/news URL
Merge branch 'gh-pages' of https://github.com/SUNYFredonia/homepage into gh-pages

Conflicts:
	_posts/boxes/2014-07-22-teaching-and-learning-conference-in-august.md