Merge pull request #1 from jonathanmtran/master

Jon's changes
It's not October anymore.
Alert Change

No more saying "Boo"
Merge pull request #2 from jjulagay/master

Alert Change
Merge remote-tracking branch 'upstream/master'

Conflicts:
	index.html