Initial pump thingy
 Some strange merge problem, merged alfs with master
 Fixed up alf branch, I dont know what was wrong with it really.
Initial transformer
Initial pump and transformer
Added a new image of the fire
Merge branch 'master' of github.com:CiaranMcCann/Nina
 Dirty merge for some reason, not sure why
 Updated gitignore
Merge branch 'master' of github.com:CiaranMcCann/Nina
Merge from master