Pop up script added
Terms of participation added
Merge branch '2014' of github.com:magmarails/cfp-magmarails-com into 2014