Re-commit all changes made today

- forgot to pull before pushing :P