Update 2015-01-15-17.md
Merge pull request #41 from ModelWriter/Workshop-Program-FE

Update 2015-01-15-17.md
Merge pull request #42 from ModelWriter/master

[master] -> [FE]