added some prelim alert pages
Merge remote branch 'origin/master'
remove .DS_Store file (it's gitignored)