merge test
merge test
got rid of alert in js
Merge pull request #9 from spencerolson/bontgoy

merge test