Blog update at 2014-12-04 19:57:24
Blog update at 2014-12-04 19:59:43
resolving merge conflict from setting up initial site
Blog update at 2014-12-04 20:00:42