update to pull in Laptop changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Blender/Bulldozer.blend
	Blender/Bulldozer.blend1
	Blender/Bulldozer.blend2
	eclipse/.metadata/.log
	eclipse/.metadata/.mylyn/.tasks.xml.zip
	eclipse/.metadata/.mylyn/tasks.xml.zip
	eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.indexes/e4/81/9c/a5/1d/history.index
	eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.markers
	eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/org.eclipse.jdt.core/state.dat
	eclipse/.metadata/.plugins/org.eclipse.core.resources/.root/11.tree
	eclipse/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	eclipse/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	eclipse/.metadata/.plugins/org.eclipse.jdt.core/286606776.index
	eclipse/.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache
	eclipse/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	eclipse/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	eclipse/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	eclipse/.metadata/version.ini
	src/com/projectreddog/machinemod/entity/EntityBulldozer.java
	src/com/projectreddog/machinemod/entity/EntityMachineMod.java