Added gradle generated files to gitignore, since we don't want git whining that they've changed every time we build
Merge branch 'master' of https://github.com/captaincrutches/cs2340-team47