Initial commit
Final version for grading