rebuilding site Wed May 14 17:35:31 PDT 2014
rebuilding site Wed May 14 18:44:35 PDT 2014
rebuilding site Wed May 14 18:46:50 PDT 2014
rebuilding site Thu May 15 02:40:48 PDT 2014
Merge commit '5c111743a03d2c6ed2e0b14bd3091cac8974c8da' into sources

Conflicts:
	public/index.html
removed public
rebuilding site Fri Jun 13 14:34:30 PDT 2014