udacity web development - problem set 2
merging conflicts