ignoring .o files in the gitignore
added makefile to compile the video classes
Merge branch 'video' into dev

Conflicts:
	framework/makefile