branch test
AND simple
& simple
conflict fixed
add merge
merge with no-ff
added a new footer [issue 53]
fixed the broken email address
dev add index.html
Merge branch 'dev' into iss53
iss53
fix conflicts