added a line for master only
merge

Conflicts:
	index.html

merged from master
added a new line on 1/30/2013 in master.
Merge branch 'release1' to master

Conflicts:
	test.html
Merge branch 'release1'
added on master branch
added a line on release1 branch
Merge branch 'master' into release1

Conflicts:
	home.html