anchor.diff:  	<TBODY>
   		<TR>&nbsp;</TR>
   		<TR>
  -<<<<<<< HEAD
   			<TD>
   				<P class="resume-right"><FONT FACE="Century Gothic, serif"><FONT SIZE=4 STYLE="font-size: 18pt"><B>Dan Johnson</B></FONT></FONT></P>
  -=======
  -			<TD WIDTH=933 VALIGN=TOP style="padding-top: 10px;">
  -				<P ALIGN=RIGHT><FONT FACE="Century Gothic, serif"><FONT SIZE=4 STYLE="font-size: 16pt"><B>Dan Johnson</B></FONT></FONT></P>
  ->>>>>>> 66b064d9b180c9c29e19a60ab3fef47bce7e7f03
   			</TD>
   		</TR>
   		<TR>
  -<<<<<<< HEAD
   			<TD>
   				<p class="resume-right">4998 SE Briar Ct., Milwaukie, Oregon 97267</p>
   				<p class="resume-right">Phone 503.449.8357 ● drj3141@gmail.com</p>
   				<p class="resume-right">linkedin.com/in/drjohnson3141 ● github.com/danjohnson3141 </p>
   				<p class="resume-right">portfolio | <a href="www.turtlesthewholewaydown.com">www.turtlesthewholewaydown.com</a></p>
  -=======
  -			<TD WIDTH=933 VALIGN=TOP>
  -				<P ALIGN=RIGHT STYLE="margin-top: 0.04in; margin-bottom: 0in"><FONT FACE="Helvetica, Arial, sans-serif"><FONT SIZE=1 STYLE="font-size: 8pt">4998
  -				SE Briar Ct., Milwaukie, Oregon 97267</FONT></FONT></P>
  -				<P ALIGN=RIGHT STYLE="margin-top: 0.04in; margin-bottom: 0in"><FONT FACE="Century Gothic, serif"><FONT SIZE=1 STYLE="font-size: 8pt"><FONT FACE="Helvetica, Arial, sans-serif">Phone
  -				503.449.8357 </FONT><FONT FACE="Helvetica, Arial, sans-serif">●</FONT><FONT FACE="Helvetica, Arial, sans-serif">
  -				</FONT><FONT COLOR="#0000ff"><SPAN LANG="zxx"><U><A HREF="mailto:drj3141@gmail.com"><FONT FACE="Helvetica, Arial, sans-serif">drj3141@gmail.com</FONT></A></U></SPAN></FONT><FONT FACE="Helvetica, Arial, sans-serif">
  -				</FONT><FONT FACE="Helvetica, Arial, sans-serif">●</FONT><FONT FACE="Helvetica, Arial, sans-serif">
  -				<a href="github.com/danjohnson3141">github.com/danjohnson3141</a></FONT></FONT></FONT></P>
  -				<P ALIGN=RIGHT STYLE="margin-top: 0.04in; margin-bottom: 0in"><FONT FACE="Century Gothic, serif"><FONT SIZE=1 STYLE="font-size: 8pt"><FONT COLOR="#0000ff"><SPAN LANG="zxx"><A HREF="http://www.linkedin.com/in/drjohnson3141/"><FONT COLOR="#666666"><SPAN STYLE="text-decoration: none"><FONT FACE="Helvetica, Arial, sans-serif"><FONT SIZE=1 STYLE="font-size: 8pt"><SPAN STYLE="font-style: normal"><SPAN STYLE="font-weight: normal"><a href="linkedin.com/in/drjohnson3141/">linkedin.com/in/drjohnson3141</a></SPAN></SPAN></FONT></FONT></SPAN></FONT></A></SPAN></FONT></FONT></FONT></P>
  -				<P ALIGN=RIGHT STYLE="margin-top: 0.04in"><FONT COLOR="#0000ff"><FONT COLOR="#666666"><SPAN STYLE="text-decoration: none">
  -				<FONT FACE="Century Gothic, serif"><FONT SIZE=1 STYLE="font-size: 8pt"><SPAN LANG="zxx"><FONT FACE="Helvetica, Arial, sans-serif"><FONT SIZE=1 STYLE="font-size: 8pt"><SPAN STYLE="font-style: normal"><SPAN STYLE="font-weight: normal"><a href="http://www.turtlesthewholewaydown.com">portfolio | www.turtlesthewholewaydown.com</a></SPAN></SPAN></FONT></FONT></SPAN></FONT></SPAN></FONT></FONT></FONT></P>
  ->>>>>>> 66b064d9b180c9c29e19a60ab3fef47bce7e7f03
   			</TD>
   		</TR>
   	</TBODY>
  
positive.code: 		</TD>
  		<TD WIDTH=823>
  			<P ALIGN=LEFT STYLE="margin-top: 0.04in; font-style: normal; font-weight: normal">
  <<<<<<< HEAD
  			<FONT COLOR="#333333"><FONT FACE="Helvetica, Arial, sans-serif"><FONT SIZE=1 STYLE="font-size: 8pt">Accomplished software developer with comprehensive programming experience in Ruby on Rails, PHP, JavaScript, jQuery, AJAX, CSS3 and HTML5.
  			Highly knowledgeable in relational databases design, SQL, and
  			stored procedures. Well versed in test-driven development and
  
negative.code: 				Systems: OSX, MS Windows (3.1-7), Linux (Ubuntu), OS/400
  				(iSeries)</li>
  			</ul>
  		</TD>
  	</TR>
  	<TR VALIGN=TOP>
  