Merge branch 'master' into jlin27-quant-url-patch

Author: brianjo

beginner_source/data_loading_tutorial.py

@@ -67,7 +67,8 @@
 
 n = 65
 img_name = landmarks_frame.iloc[n, 0]
-landmarks = landmarks_frame.iloc[n, 1:].as_matrix()
+landmarks = landmarks_frame.iloc[n, 1:]
+landmarks = np.asarray(landmarks)
 landmarks = landmarks.astype('float').reshape(-1, 2)
 
 print('Image name: {}'.format(img_name))