Revert abe42a5..d12e8ec

This rolls back to commit abe42a5d42b82378a1f92a288abd711310171490.
Added Entity class
Changed .gitignore again (I might have fucked everything up)