add
add other
footer
Merge pull request #6 from Lich2013/dev

Dev