new diaspora : less time consuming
Merge branch 'master' of github.com:Elarnon/north-american-octo-wight
diaspora
Merge branch 'master' of github.com:Elarnon/north-american-octo-wight