Lab updates

db/lab.json

@@ -338,13 +338,14 @@
 			"ubit" : "snehakri"
 		},
 		"Anand Sankar Bhagavandas" : {
-			"status" : "MS",
+			"degree" : "MS",
 	    "year" : 2017,
 			"projects" : ["mimir"],
 			"ubit" : "anandsan"
 		},
 		"Shivang Aggarwal" : {
 	    "degree" : "MS",
+	    "year" : 2017,
 	    "projects" : ["mimir"],
 	    "ubit" : "shivanga",
 			"link" : "http://about.me/shivangaggarwal",

src/people/index.erb

@@ -42,7 +42,9 @@ title: Members and Affiliates
 			<% else %>
 				<%= name %>
 			<% end %>
-			<span class="affiliation"><%= data["degree"] %>; <%= data["year"] %>; <%= data["position"] %> @ <%= data["company"] %></span>
+			<span class="affiliation"><%= data["degree"] %>; <%= data["year"] %><% if data.has_key? "company" %>;
+				<%= if data.has_key? "position" then data["position"] + " @" else "" end %> <%= data["company"] %>
+			<% end %></span>
 		</div>
 	<% end %>