Added fish and added Date
Merge https://github.com/ingridh/csuahack