Merge branch 'master' into develop
Merge branch 'master' into develop
Merge branch 'master' into develop
Added linklog basics to atom feed

It is still super yuck and is full of RY. 

Will be a todo to fix later.
Merge branch 'linklog-atom' into develop
Merge branch 'develop'