Time finally works
Limit time in this place too
Remove test time view, add time clearing to clear_sim, add element finally
remove IRON placeholderence
remove the graphics func for now, ill add later
a new graphics function
Merge branch 'master' of http://github.com/FacialTurd/PowderToypp into time
First SPRK bug time fix, some formatting
More formatting, fixes error
Merge remote-tracking branch 'origin/develop' into time

Conflicts:
Resolved: src/graphics/Renderer.cpp
Will pick: src/simulation/Simulation.cpp
Resolved: src/simulation/Simulation.h
Resolved: src/simulation/elements/IRON.cpp
Cherry-pick: Time finally works
Merge branch 'time' of https://github.com/mniip/The-Powder-Toy into mniip-time

Conflicts:
	src/simulation/Simulation.cpp
Merge branch 'master' into develop