Skip to content

Commit d1ad8b1

Browse files
authored
Merge pull request #3 from lemonci/src
Src
2 parents 4848a03 + 556facc commit d1ad8b1

File tree

13 files changed

+18
-8
lines changed

13 files changed

+18
-8
lines changed

pages/about-us.rst

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,15 @@ It's Nice To meet you
3636
</div>
3737
<div class="col-lg-5">
3838
</div></div><div class="col-lg-7">
39-
<iframe src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d44743.69551272658!2d-73.6064564127952!3d45.50039571105371!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x4cc9198ce22ed24d%3A0x733df471f5d54536!2sPavillons+Pierre-Lassonde+et+Claudette+McKay-Lassonde%2C+2500+Chemin+de+Polytechnique!5e0!3m2!1sen!2s!4v1402500602803" width="100%" height="350" frameborder="0" style="border:0"></iframe>
39+
<!--iframe src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d44743.69551272658!2d-73.6064564127952!3d45.50039571105371!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x4cc9198ce22ed24d%3A0x733df471f5d54536!2sPavillons+Pierre-Lassonde+et+Claudette+McKay-Lassonde%2C+2500+Chemin+de+Polytechnique!5e0!3m2!1sen!2s!4v1402500602803" width="100%" height="350" frameborder="0" style="border:0"></iframe-->
40+
<iframe src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d699.1126309058778!2d-73.61642287137738!3d45.50100869818461!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x4cc919f308df50f9%3A0x1c5cdca60001c62e!2sUdeM%20%E2%80%93%20Andr%C3%A9-Aisenstadt%20Pavillon!5e0!3m2!1sen!2sca!4v1758227393629!5m2!1sen!2sca" width="100%" height="350" frameborder="0" style="border:0"></iframe>
4041
</div><div class="col-lg-5"><img src="/images/poly.jpg" width="100%"/>
4142
<img class="pull-right" src="/images/mistlogo.png" width="40%" style="margin-top: 0px;"/>
4243
<h3>MIST Lab</h3>
4344
<h4>Polytechnique Montreal</h4>
44-
<p>2500 chemin de Polytechnique.<br>
45-
Montreal, QC, Canada, H3T 1J4<br>
45+
<p>André-Aisenstadt Pavillon<br>
46+
2920 Chemin de la Tour<br>
47+
Montreal, QC, Canada, H3T 1N8<br>
4648
</p>
4749
<p><i class="fa fa-phone"></i> <abbr title="Phone">P</abbr>: (514) 340-4711 x2370</p>
4850
<p><i class="fa fa-envelope-o"></i> <abbr title="Email">E</abbr>: <a href="mailto:info@mistlab.ca">info@mistlab.ca</a></p>

people/dvielfaure/person.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ Tagline=Work hard and have fun doing it
55
Image=/people/dvielfaure/david.jpg
66
Facebook=https://www.facebook.com/david.vielfaure
77
Linkedin=https://www.linkedin.com/in/david-vielfaure-a0106a136/
8+
Alumnus=True

people/dwang/person.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ Occupation=Master student
44
Tagline=have you ever heard about otaku?
55
Image=/people/dwang/dong.jpg
66
Facebook=https://www.facebook.com/profile.php?id=100026506446879
7+
Alumnus=True

people/dwenqiang/person.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ Occupation=PhD Student
44
Tagline=Robots will be part of our lives. My job is to make it comes a little faster.
55
Image=/people/dwenqiang/dwenqiang.jpg
66
Facebook=https://www.facebook.com/snow.wenqiang.du
7+
Alumnus=True

people/emarjani/person.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ Occupation=PhD Student
44
Tagline=A soccer player who made soccer playing robots.
55
Image=/people/emarjani/ehsan.jpg
66
Linkedin=https://www.linkedin.com/in/seyed-ehsan-marjani-bajestani/
7+
Alumnus=True

people/fwu/person.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ Name=Fang Wu
33
Occupation=Postdoctoral fellow
44
Tagline=I am large. I contain multitudes.
55
Image=/people/fwu/fang.jpg
6+
Alumnus=True

people/hfouad/person.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[Person]
22
Name=Hassan Fouad
3-
Occupation=PhD Student
3+
Occupation=Postdoctoral Fellow
44
Tagline=Exploring ...
5-
Image=/people/hfouad/hassan.jpg
5+
Image=/people/hfouad/hassan.jpg

people/mkaufmann/person.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ Image=/people/mkaufmann/mkaufmann.png
66
Linkedin=http://www.linkedin.com/in/kaufmann-space/
77
Twitter=https://twitter.com/MaceSpaceNerd
88
Web=http://www.kaufmann.space
9+
Alumnus=True

people/nvalench/person.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ Occupation=Master student
44
Tagline=Real Time and Embedding Systems engineer
55
Image=/people/nvalench/nvalench.jpg
66
Linkedin=https://www.linkedin.com/in/nicolas-valenchon-254b7914a
7+
Alumnus=True

people/plajoie/person.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[Person]
22
Name=Pierre-Yves Lajoie
3-
Occupation=PhD Student
3+
Occupation=Assistant Professor
44
Tagline=Social progress will be through science
55
Image=/people/plajoie/pierre-yves_lajoie.jpg
66
Linkedin=https://www.linkedin.com/in/pierre-yves-lajoie-4aaab863/

0 commit comments

Comments
 (0)