Added map loading from files.

Modified TODO. Added test map. Re-added var to for loops to prevent bug
with firefox.