Added some git ignores, and moved Andre's commit to the right branch