Browse Source

Merge conflicts to CV

Andrea Franceschini 7 years ago
parent
commit
0781f61a79
1 changed files with 5 additions and 4 deletions
  1. 5 4
      pages/cv.php

+ 5 - 4
pages/cv.php

@@ -63,10 +63,10 @@ $twitter_image = 'images/colopic.jpg';
 					<section>
 						<p>January 2016 &mdash; present</p>
 						<p><strong>Post Doctoral Research Associate</strong></p>
-						<p><strong><a href="https://www.cl.cam.ac.uk"/>Computer Laboratory</a><br/>University of Cambridge</strong>, UK</p>
+						<p><strong><a href="https://www.cl.cam.ac.uk"/>The Computer Laboratory</a><br/>University of Cambridge</strong>, UK</p>
 						<p>Research and development for <a href="//www.isaacphysics.org">Isaac Physics</a>.</p>
 						<ul>
-	 						<li><strong>Research</strong>: analysis of impact based on <a href="https://www.compare-school-performance.service.gov.uk/">DfE exam results</a> and development of strategies to improve impact and engagement; learning outcome of different question formats</li>
+	 						<li><strong>Research</strong>: analysis of impact based on <a href="https://www.compare-school-performance.service.gov.uk/">DfE exam results</a> and development of strategies to improve impact and engagement; learning outcome of different question formats; training and technical support for <a href="//www.asidatascience.com/">ASI Data Science Fellows</a> working on various projects</li>
 							<li><strong>Development</strong>: <a href="https://isaacphysics.org/equality">a graphical, web-based entry system for symbolic formulas</a></li>
 							<li><strong>Other</strong>: maintenance and infrastructure development</li>
 						</ul>
@@ -75,7 +75,7 @@ $twitter_image = 'images/colopic.jpg';
 						<p>November 2016 &mdash; present</p>
 						<p><strong>Post Doctoral Research Associate</strong></p>
 						<p><strong><a href="https://www.robinson.cam.ac.uk/">Robinson College</a><br/>University of Cambridge</strong>, UK</p>
-						<p>Teaching Supervisor for the <a href="https://www.cl.cam.ac.uk/teaching/">Computer Science tripos</a> (see teaching experience).</p>
+						<p>Teaching By-Fellow for the <a href="https://www.cl.cam.ac.uk/teaching/">Computer Science tripos</a> (see teaching experience).</p>
 					</section>
 					<section>
 						<p>2006 &mdash; present</p>
@@ -99,9 +99,10 @@ $twitter_image = 'images/colopic.jpg';
 						<p>Students from Robinson, Gonville and Caius, King's, Trinity.</p>
 						<p>Courses:</p>
 						<ul>
+						<li><a href="//www.cl.cam.ac.uk/teaching/1718/IntDesign">Interaction Design</a> (2017/18)</li>
 							<li><a href="//www.cl.cam.ac.uk/teaching/1718/FHCI">Further Human-Computer Interaction</a> (2017/18)</li>
-							<li><a href="//www.cl.cam.ac.uk/teaching/1718/IntDesign">Interaction Design</a> (2017/18)</li>
 							<li><a href="//www.cl.cam.ac.uk/teaching/1718/Graphics">Introduction to Graphics</a> (2017/18)</li>
+							<li><a href="//www.cl.cam.ac.uk/teaching/1718/AdvGraph">Advanced Graphics</a> (2017/18)</li>
 							<li><a href="//www.cl.cam.ac.uk/teaching/1718/ProgC/">Programming in C</a> (2017/18)</li>
 							<li><a href="//www.cl.cam.ac.uk/teaching/1718/FJava">Further Java</a> (2017/18)</li>
 							<li><a href="//www.cl.cam.ac.uk/teaching/1617/CandC++/">Programming in C and C++</a> (2016/17)</li>