Merge remote-tracking branch 'origin/master'

# Conflicts:
#	js/main.js

.gitignore

@@ -0,0 +1,2 @@
+README.md
+README.md

README.md

@@ -1,2 +1,10 @@
 Hello World!
-:P=OP=OP=OP
+<<<<<<< HEAD
+
+
+
+
+:)
+=======
+:P
+>>>>>>> origin/master

js/main.js

@@ -9,12 +9,30 @@
     "use strict";
 
     $( document ).ready(function() {
+<<<<<<< HEAD
     	// jQuery Code
     	$(".col-xs-6:last-child").hide(); //Hide do ultimo author
 
     	//Alteracao das informacoes do segundo author (jessica) //TODO
     	$(".col-xs-6:nth-child(3)").children(".thumbnail").children(".caption").hide();
+=======
+      var NUM_STUDENTS = 3;
+>>>>>>> origin/master
 
+      $(".col-xs-6:last-child").hide() //ESCONDE O ULTIMO AUTOR
+      
+      for (var i = 1; i <= NUM_STUDENTS; i++)
+      	changeStudentPhoto(i);	
     });
 
+    function changeStudentPhoto(nrStudent){
+    	// Wrap photo in standard size
+    	var photoSize = 400;
+    	
+    	if(nrStudent < 1 || nrStudent > 3)
+    		return;
+    	
+    	$(".col-xs-6:nth-child("+(nrStudent+1)+") img").css('height', photoSize).css('width', photoSize);
+    }
+
 })();