update .gitignore

Signed-off-by: Sean Fung <fengxiang220@gmail.com>
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
delete wrong commit

Signed-off-by: Sean Fung <fengxiang220@gmail.com>