locked in now triggers.
Merge branch 'master' of https://github.com/awardell/GP_AW_cmps148_IF

Conflicts:
	ifproject.inform/Skein.skein
Merge branch 'master' of https://github.com/awardell/GP_AW_cmps148_IF

Conflicts:
	ifproject.inform/Build/Debug log.txt
	ifproject.inform/Build/Problems.html
	ifproject.inform/Build/auto.inf
	ifproject.inform/Build/gameinfo.dbg
	ifproject.inform/Build/output.ulx
	ifproject.inform/Index/Actions.html
	ifproject.inform/Index/Contents.html
	ifproject.inform/Index/Details/0_A.html
	ifproject.inform/Index/Details/10_A.html
	ifproject.inform/Index/Details/11_A.html
	ifproject.inform/Index/Details/12_A.html
	ifproject.inform/Index/Details/13_A.html
	ifproject.inform/Index/Details/14_A.html
	ifproject.inform/Index/Details/15_A.html
	ifproject.inform/Index/Details/16_A.html
	ifproject.inform/Index/Details/17_A.html
	ifproject.inform/Index/Details/18_A.html
	ifproject.inform/Index/Details/19_A.html
	ifproject.inform/Index/Details/1_A.html
	ifproject.inform/Index/Details/20_A.html
	ifproject.inform/Index/Details/21_A.html
	ifproject.inform/Index/Details/22_A.html
	ifproject.inform/Index/Details/23_A.html
	ifproject.inform/Index/Details/24_A.html
	ifproject.inform/Index/Details/25_A.html
	ifproject.inform/Index/Details/26_A.html
	ifproject.inform/Index/Details/27_A.html
	ifproject.inform/Index/Details/28_A.html
	ifproject.inform/Index/Details/29_A.html
	ifproject.inform/Index/Details/2_A.html
	ifproject.inform/Index/Details/30_A.html
	ifproject.inform/Index/Details/31_A.html
	ifproject.inform/Index/Details/32_A.html
	ifproject.inform/Index/Details/33_A.html
	ifproject.inform/Index/Details/34_A.html
	ifproject.inform/Index/Details/35_A.html
	ifproject.inform/Index/Details/36_A.html
	ifproject.inform/Index/Details/37_A.html
	ifproject.inform/Index/Details/38_A.html
	ifproject.inform/Index/Details/39_A.html
	ifproject.inform/Index/Details/3_A.html
	ifproject.inform/Index/Details/40_A.html
	ifproject.inform/Index/Details/41_A.html
	ifproject.inform/Index/Details/42_A.html
	ifproject.inform/Index/Details/43_A.html
	ifproject.inform/Index/Details/44_A.html
	ifproject.inform/Index/Details/45_A.html
	ifproject.inform/Index/Details/46_A.html
	ifproject.inform/Index/Details/47_A.html
	ifproject.inform/Index/Details/48_A.html
	ifproject.inform/Index/Details/49_A.html
	ifproject.inform/Index/Details/4_A.html
	ifproject.inform/Index/Details/50_A.html
	ifproject.inform/Index/Details/51_A.html
	ifproject.inform/Index/Details/52_A.html
	ifproject.inform/Index/Details/53_A.html
	ifproject.inform/Index/Details/54_A.html
	ifproject.inform/Index/Details/55_A.html
	ifproject.inform/Index/Details/56_A.html
	ifproject.inform/Index/Details/57_A.html
	ifproject.inform/Index/Details/58_A.html
	ifproject.inform/Index/Details/59_A.html
	ifproject.inform/Index/Details/5_A.html
	ifproject.inform/Index/Details/60_A.html
	ifproject.inform/Index/Details/61_A.html
	ifproject.inform/Index/Details/62_A.html
	ifproject.inform/Index/Details/63_A.html
	ifproject.inform/Index/Details/64_A.html
	ifproject.inform/Index/Details/65_A.html
	ifproject.inform/Index/Details/66_A.html
	ifproject.inform/Index/Details/67_A.html
	ifproject.inform/Index/Details/68_A.html
	ifproject.inform/Index/Details/69_A.html
	ifproject.inform/Index/Details/6_A.html
	ifproject.inform/Index/Details/70_A.html
	ifproject.inform/Index/Details/71_A.html
	ifproject.inform/Index/Details/72_A.html
	ifproject.inform/Index/Details/73_A.html
	ifproject.inform/Index/Details/74_A.html
	ifproject.inform/Index/Details/75_A.html
	ifproject.inform/Index/Details/76_A.html
	ifproject.inform/Index/Details/77_A.html
	ifproject.inform/Index/Details/78_A.html
	ifproject.inform/Index/Details/79_A.html
	ifproject.inform/Index/Details/7_A.html
	ifproject.inform/Index/Details/80_A.html
	ifproject.inform/Index/Details/81_A.html
	ifproject.inform/Index/Details/82_A.html
	ifproject.inform/Index/Details/8_A.html
	ifproject.inform/Index/Details/9_A.html
	ifproject.inform/Index/Kinds.html
	ifproject.inform/Index/Phrasebook.html
	ifproject.inform/Index/Rules.html
	ifproject.inform/Index/Scenes.html
	ifproject.inform/Index/World.html

did a lot of trying to get search in...
Merge branch 'master' of https://github.com/awardell/GP_AW_cmps148_IF

Conflicts:
	Rooms.inform/Skein.skein
	ifproject.inform/Build/Debug log.txt
	ifproject.inform/Build/Problems.html
	ifproject.inform/Build/auto.inf
	ifproject.inform/Build/gameinfo.dbg
	ifproject.inform/Build/output.ulx
	ifproject.inform/Index/Actions.html
	ifproject.inform/Index/Contents.html
	ifproject.inform/Index/Details/0_A.html
	ifproject.inform/Index/Details/10_A.html
	ifproject.inform/Index/Details/11_A.html
	ifproject.inform/Index/Details/12_A.html
	ifproject.inform/Index/Details/13_A.html
	ifproject.inform/Index/Details/14_A.html
	ifproject.inform/Index/Details/15_A.html
	ifproject.inform/Index/Details/16_A.html
	ifproject.inform/Index/Details/17_A.html
	ifproject.inform/Index/Details/18_A.html
	ifproject.inform/Index/Details/19_A.html
	ifproject.inform/Index/Details/1_A.html
	ifproject.inform/Index/Details/20_A.html
	ifproject.inform/Index/Details/21_A.html
	ifproject.inform/Index/Details/22_A.html
	ifproject.inform/Index/Details/23_A.html
	ifproject.inform/Index/Details/24_A.html
	ifproject.inform/Index/Details/25_A.html
	ifproject.inform/Index/Details/26_A.html
	ifproject.inform/Index/Details/27_A.html
	ifproject.inform/Index/Details/28_A.html
	ifproject.inform/Index/Details/29_A.html
	ifproject.inform/Index/Details/2_A.html
	ifproject.inform/Index/Details/30_A.html
	ifproject.inform/Index/Details/31_A.html
	ifproject.inform/Index/Details/32_A.html
	ifproject.inform/Index/Details/33_A.html
	ifproject.inform/Index/Details/34_A.html
	ifproject.inform/Index/Details/35_A.html
	ifproject.inform/Index/Details/36_A.html
	ifproject.inform/Index/Details/37_A.html
	ifproject.inform/Index/Details/38_A.html
	ifproject.inform/Index/Details/39_A.html
	ifproject.inform/Index/Details/3_A.html
	ifproject.inform/Index/Details/40_A.html
	ifproject.inform/Index/Details/41_A.html
	ifproject.inform/Index/Details/42_A.html
	ifproject.inform/Index/Details/43_A.html
	ifproject.inform/Index/Details/44_A.html
	ifproject.inform/Index/Details/45_A.html
	ifproject.inform/Index/Details/46_A.html
	ifproject.inform/Index/Details/47_A.html
	ifproject.inform/Index/Details/48_A.html
	ifproject.inform/Index/Details/49_A.html
	ifproject.inform/Index/Details/4_A.html
	ifproject.inform/Index/Details/50_A.html
	ifproject.inform/Index/Details/51_A.html
	ifproject.inform/Index/Details/52_A.html
	ifproject.inform/Index/Details/53_A.html
	ifproject.inform/Index/Details/54_A.html
	ifproject.inform/Index/Details/55_A.html
	ifproject.inform/Index/Details/56_A.html
	ifproject.inform/Index/Details/57_A.html
	ifproject.inform/Index/Details/58_A.html
	ifproject.inform/Index/Details/59_A.html
	ifproject.inform/Index/Details/5_A.html
	ifproject.inform/Index/Details/60_A.html
	ifproject.inform/Index/Details/61_A.html
	ifproject.inform/Index/Details/62_A.html
	ifproject.inform/Index/Details/63_A.html
	ifproject.inform/Index/Details/64_A.html
	ifproject.inform/Index/Details/65_A.html
	ifproject.inform/Index/Details/66_A.html
	ifproject.inform/Index/Details/67_A.html
	ifproject.inform/Index/Details/68_A.html
	ifproject.inform/Index/Details/69_A.html
	ifproject.inform/Index/Details/6_A.html
	ifproject.inform/Index/Details/70_A.html
	ifproject.inform/Index/Details/71_A.html
	ifproject.inform/Index/Details/72_A.html
	ifproject.inform/Index/Details/73_A.html
	ifproject.inform/Index/Details/74_A.html
	ifproject.inform/Index/Details/75_A.html
	ifproject.inform/Index/Details/76_A.html
	ifproject.inform/Index/Details/77_A.html
	ifproject.inform/Index/Details/78_A.html
	ifproject.inform/Index/Details/79_A.html
	ifproject.inform/Index/Details/7_A.html
	ifproject.inform/Index/Details/80_A.html
	ifproject.inform/Index/Details/81_A.html
	ifproject.inform/Index/Details/82_A.html
	ifproject.inform/Index/Details/8_A.html
	ifproject.inform/Index/Details/9_A.html
	ifproject.inform/Index/Kinds.html
	ifproject.inform/Index/Phrasebook.html
	ifproject.inform/Index/Rules.html
	ifproject.inform/Index/Scenes.html
	ifproject.inform/Index/World.html
	ifproject.inform/Skein.skein
	ifproject.inform/Source/story.ni
Merge branch 'master' of https://github.com/awardell/GP_AW_cmps148_IF

Conflicts:
	ifproject.inform/Build/Debug log.txt
	ifproject.inform/Build/auto.inf
	ifproject.inform/Build/gameinfo.dbg
	ifproject.inform/Build/output.ulx
	ifproject.inform/Source/story.ni