Starting to abstract rendering layer with Rendercontext.cpp
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Makefile
Merge pull request #2 from woodne/master

Awesometown