third page
Merge branch 'master' of https://github.com/meet-projects/iscream-yl1-2014
4th page
fixing merges'