contact.html
Merge commit '03f86c00366156f8a4936cf4cbb0af0cc718058a'

* commit '03f86c00366156f8a4936cf4cbb0af0cc718058a':
  将路线图中最后一个城市的lineLength设为0。
  路线图优化。
  isNan改为isNaN
  奖品介绍

Conflicts:
	iyiqifei/src/main/java/com/guivuikiong/iyiqifei/service/PrizeService.scala
Merge branch 'master' of https://github.com/guivuikiong/iyiqifei

# By weijunhui
# Via weijunhui
* 'master' of https://github.com/guivuikiong/iyiqifei:
  中奖号码输入