Merge branch 'master' of /Users/sxl439/Dropbox/ist510sp2014 with conflicts.
add search function