Merge branch 'master' of https://github.com/XSpring/YTVideoNaming

Conflicts:
	src/controllers/dataControllers/videoController.java
	src/controllers/modelControllers/modelController.java
	src/models/LRGradDescModel.java
	src/models/genericModel.java