Merge pull request #1 from woodne/master

Making the make file better
fixing makefile for linux
Starting to abstract rendering layer with Rendercontext.cpp
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Makefile