Student files (had ignored previously)
Merge pull request #2 from cgosingtian/dev_1.0

Student files (had ignored previously)