Merge Hw2 To Master

Fixed Hw2 Indexing Error Caused in FireFox