gitignore update -Riley
Merge branch 'motors-Riley' of http://github.com/ryeakle/CamTrap_Viper into motors-Riley

Conflicts:
	.gitignore