No longer ignore gif files
Fixed a few things
Updated makefile
Merged