1st version
1st version
1st version
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
Merge pull request #28 from luwei0917/Wei_Lu

Wei lu