Removed tptlibrary, ignored my stuff folder
Minor gitignore edit
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge https://github.com/FacialTurd/The-Powder-Toy
you know the drill
Merge branch 'master' of https://github.com/FacialTurd/The-Powder-Toy
Made STKM use different particles as jetpack spew
Initial CERA commit
CERA now reacts with VIRG and PROT
CERA now implements most of its simple features
Added CERA synthesis
Merge pull request #12 from boxmein/element-jetpack

Element jetpack
Update .gitignore
Update .travis.yml

Removed some excess and uploading to server
Merge pull request #15 from boxmein/ceramics

Ceramics
Update .travis.yml
Range of fixes
Fixed compiling, Added better look to LITH, Made it my mod, added stripping as a linker option
Merge branch 'master' into develop

Conflicts:
	.travis.yml