75 Commits

Author	SHA1	Message	Date
jdeckerMS	d5f18a4674	done	2016-07-11 10:34:46 -07:00
jdeckerMS	c3707d3728	Merge remote-tracking branch 'refs/remotes/origin/rs1' into jdprov ... # Conflicts: # education/windows/TOC.md	2016-06-10 12:44:58 -07:00
Trudy Hakala	e797483bc4	updates to staged topics	2016-06-08 15:29:15 -07:00
Trudy Hakala	734e032dc3	adding art, updating content	2016-06-08 14:32:12 -07:00
jdeckerMS	9ecbd4f138	fix art	2016-06-08 13:52:20 -07:00
jdeckerMS	0be3f9a0a1	add apps	2016-06-08 12:30:33 -07:00
jdeckerMS	c1752cca91	sync to stage	2016-06-08 09:21:30 -07:00
Trudy Hakala	c17fcf606d	adding art and updating topics	2016-06-07 19:23:18 -07:00
Trudy Hakala	40a79ac8a8	adding images and content	2016-06-07 15:20:24 -07:00
Trudy Hakala	319a41a845	adding art, adding files to TOC, and updates for teacher topic	2016-06-02 13:18:37 -07:00
jdeckerMS	aa7c5cd31f	feedback from TylerD	2016-05-26 09:46:02 -07:00
jdeckerMS	6bebf4c3a5	fix link, art	2016-05-26 08:46:34 -07:00
jdeckerMS	14c33eb654	add steps to apply task	2016-05-26 08:22:28 -07:00
jdeckerMS	e125a551b1	add how-to steps for setup app	2016-05-24 08:09:16 -07:00
jdeckerMS	118c5e1d07	resync	2016-05-20 09:41:20 -07:00
jdeckerMS	ffbbc8f9cf	update IT minecraft	2016-05-19 12:34:48 -07:00
jdeckerMS	e008b37114	will another commit get tnstage working again?	2016-05-19 12:16:16 -07:00
jdeckerMS	5a00c00858	header display fix?	2016-05-19 10:03:34 -07:00
jdeckerMS	4a649a57f5	sync new topic structure	2016-05-19 09:13:25 -07:00
jdeckerMS	d9d54f40a6	new art, topic updates	2016-05-19 08:04:39 -07:00
jdeckerMS	3d925ce9dd	updated multiple	2016-05-17 13:16:42 -07:00
jdeckerMS	ded583a15c	restrctured take-a-test	2016-05-17 08:25:42 -07:00
jdeckerMS	dc4fdde96c	new art, new content	2016-05-13 10:20:21 -07:00
jdeckerMS	8395099222	copied art	2016-05-12 08:27:27 -07:00
jdeckerMS	3364685604	copied image	2016-05-12 08:03:38 -07:00