trying to get gradle to work
Add stuff to .gitignore
Merge branch 'BenBranch'

Conflicts:
	2014 Robot/.gitignore
	2014 Robot/build.gradle

Resolved conflicts with build stuff
re-add working gradle stuff