Merge pull request #1 from luwei0917/master

ni hao
Merge pull request #22 from luwei0917/Wei_Lu

1st version
Merge pull request #23 from andyjiang007/master

Merge pull request #1 from luwei0917/master
Merge pull request #2 from luwei0917/master

Merge Request #1
Merge pull request #24 from luwei0917/Wei_Lu

Wei lu
Merge pull request #3 from luwei0917/Wei_Lu

Wei lu
Update index.js
Merge pull request #25 from andyjiang007/master

a
Merge branch 'master' into Wei_Lu

Conflicts:
	public/javascripts/index.js
Merge branch 'Wei_Lu' of https://github.com/luwei0917/Tractor-RPI-V2 into Wei_Lu