did some stuff - don't remember what
Merge branch 'master' of https://github.com/nedhyett/ElementalCraft

Conflicts:
	src/nedhyett/elementalcraft/block/EBomb/BlockEBomb.java
	src/nedhyett/elementalcraft/block/EBomb/EntityEBombPrimed.java
did some stuff - don't remember what
added lens recipe
Merge branch 'master' of https://github.com/nedhyett/ElementalCraft