Oliver Kennedy f14012cb6b Merge branch 'gemsmith' ... # Conflicts: # src/metadata/okennedy.json # src/teaching/cse-462/index.md		2016-05-25 23:17:13 -04:00
..
cse-462	Merge branch 'gemsmith'	2016-05-25 23:17:13 -04:00
cse-562	Finishing off the other sections	2016-05-25 20:57:21 -04:00
dubstep	Finishing off the other sections	2016-05-25 20:57:21 -04:00
index.erb	Finishing off the other sections	2016-05-25 20:57:21 -04:00