Test
Merge branch 'master' of github.com:pettan0818/Assignment_Iiyama_2013_2