Commit test case 1.
18/3/2014
change in dev
feature1 changed
change in master
merge with feature1
merge 2
pull 1