fixed syntax errors
fixed conflicts
Merge pull request #18 from bkingery/master

fixed syntax errors for checkin