Fix license info.
add gitignore file.
Merge branch 'master' into will
Merge pull request #2 from yuhua-chen/will

Add gitignore file & update license info.
Merge branch 'master' into Amin

Conflicts:
	LICENSE