merging
Merge branch 'master' of https://github.com/lilisun/pentimento
putting timestamp url on side
merging and adding link button