trivial edit
Merge branch 'pelican' of https://github.com/iwcs2015/iwcs2015.github.io into pelican
 moved to iwcs2015 conferencium repo