Fix Issue 2
Merge pull request #10 from jessvalarezo/master

Issue #4
Change Colors
Update desc
Merge pull request #12 from jessvalarezo/master

added in adj and nouns, Issue #7
Merge pull request #9 from RaymondXu/master

Fix Issue 2 and 8
Merge remote-tracking branch 'upstream/master'

Conflicts:
	index.html