Merge origin/master

Conflicts:
	build.xml
	nbproject/project.bak.xml
	nbproject/project.xml
	resources/META-INF/MANIFEST.MF
Merge origin/master

Conflicts:
	build.xml
	resources/META-INF/MANIFEST.MF
Merge origin/master

Conflicts:
	nbproject/project.bak.xml
	nbproject/project.xml
	src/edu/wpi/first/wpilibj/templates/OI.java
	src/edu/wpi/first/wpilibj/templates/RobotMap.java
	src/edu/wpi/first/wpilibj/templates/commands/CommandBase.java
Merge origin/master

Conflicts:
	nbproject/project.bak.xml
	nbproject/project.xml
	src/edu/wpi/first/wpilibj/templates/OI.java
	src/edu/wpi/first/wpilibj/templates/RobotMap.java
	src/edu/wpi/first/wpilibj/templates/commands/CommandBase.java
Merge pull request #4 from subashch6/master

delete edu files