added cond
added links and alerts
correction
Merge remote-tracking branch 'upstream/master'
update index.html with icons and add map to chulavsta.html