Merge pull request #124 from mattrebor/rob

#11 - Added friendlier URL for CEMI to increase SEO
#121 updated madrid schedule and intro page