Tilt (not working properly)

Signed-off-by: Guillermo Orellana <wiyarmir@gmail.com>
Merge commit 'c2caa5f42360ca54f3085c0b16e840a82f5f80b6'
Updated .gitignore
Merge branch 'master' into dev

Conflicts:
	wiyarmir/scopes/tileentity/TileEntityScope.java