Pointer to real version
Merge branch 'master' of https://github.com/sholiday/Unofficial-Waterloo-USA-Intern-Guide into gh-pages

Conflicts:
	README.markdown
fuck Avalon
Merge pull request #10 from vikstrous/gh-pages

Added info about Avalon