last commit of week 7/25/14
updated sql for final commit of 7/25/14...work on views next time