fixed the pingpong project link changed to tournaments
Merge branch 'content' of https://github.com/deviowa/deviowa.com into content

Conflicts:
	views/alumni-2014.html
merge conflict