Initial commit
merged gitingnores
merged gitingnores
Merge branch 'master' of https://github.com/lianfeng/comp4350group4