love tags
Merge branch 'master' of http://github.com/nickolashe/zaplings-full
Merge pull request #18 from permalife/danny

Danny
Merge pull request #19 from permalife/danny

Danny
Merge pull request #20 from permalife/danny

loves edit
Merge pull request #21 from permalife/danny

loves
Merge pull request #22 from permalife/danny

loves
Merge pull request #23 from permalife/danny

index; header/footer templates added
Merge pull request #24 from permalife/danny

Danny
Merge pull request #17 from permalife/master

danny loves