Moved some code from marc.py to test.py. Changed .gitignore