Temporary committed on changes with start of sql queries
Merge branch 'master' of github.com:lmramirez/160Project