Mon May 12 20:26:42 PDT 2014
examples of error and merge conflict
added a afile
checked compile files