updated from class, iPython tutorial and ignore files