Merge branch 'master' of https://github.com/FUNPBL2014P2/Education_report
Merge branch 'master' of https://github.com/FUNPBL2014P2/Education_report
3.1と3.2を編集した
Merge branch 'master' of https://github.com/FUNPBL2014P2/Education_report
Merge branch 'master' into 3.1and3.2
Merge pull request #14 from FUNPBL2014P2/3.1and3.2

3.1and3.2