Merge pull request #48 from bmcarr928/master

Added announcement for 2014 ACM-ICPC
fix link to ACM programming competition sign-up form
Fixed merge conflict