ignore user state
Clean up assignment 2 a bit
Merge branch 'assignment-2'