1.1 Binary file Eyeball_Tutorial.pdf has changed

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/css/argentum-dark.css	Sat Jul 13 08:03:56 2013 +0100
     2.3 @@ -0,0 +1,290 @@
     2.4 +
     2.5 +/** RESETS **/
     2.6 +
     2.7 +html,body,div,span,dl,dt,dd,ul,ol,li,a,table,h1,h2,h3,h4,h5,h6,p,pre,form,fieldset,blockquote,.src,.example{margin:0px;padding:0px;font-weight:normal;text-decoration:none;font-size:inherit;color:inherit;}
     2.8 +
     2.9 +.section-number-1,.section-number-2,.section-number-3,.section-number-4,.section-number-5,.section-number-6{font-weight:inherit;}
    2.10 +
    2.11 +.float-right{float:right;}
    2.12 +
    2.13 +.author{
    2.14 +color:#666;
    2.15 +line-height:3em;
    2.16 +}
    2.17 +
    2.18 +body{
    2.19 +    font:87.5% "Georgia Serif", Times, Palatino, "Times New Roman", serif;
    2.20 +}
    2.21 +a{color:blue;}
    2.22 +html>body{font-size:14px;}
    2.23 +
    2.24 +body{
    2.25 +    width:54em;
    2.26 +    padding:1.5em;
    2.27 +    padding-top:6em;
    2.28 +
    2.29 +}
    2.30 +
    2.31 +p{
    2.32 +    line-height:1.5em;
    2.33 +    font-size:1em;
    2.34 +    margin-top:1.5em;
    2.35 +    margin-bottom:1.5em;
    2.36 +}
    2.37 +.post_list{
    2.38 +    margin-top:1.5em;
    2.39 +}
    2.40 +
    2.41 +.title{text-align:left;}
    2.42 +
    2.43 +
    2.44 +
    2.45 +h1{font-size:2.5em;line-height:1.2em;}
    2.46 +h2{font-size:1.5em;line-height:1em;margin-top:2em;margin-bottom:1em;}
    2.47 +h3{
    2.48 +    font-size:1.1667em;
    2.49 +    line-height: 1.286em;
    2.50 +    margin-top:1.929em;
    2.51 +    margin-bottom:0.643em;
    2.52 +    font-weight:bolder;
    2.53 +}
    2.54 +h4{
    2.55 +    font-weight:bold;
    2.56 +    line-height:3em;
    2.57 +}
    2.58 +
    2.59 +
    2.60 +
    2.61 +
    2.62 +/*p + dl{
    2.63 +    margin-top:-1.5em;
    2.64 +    border:1px solid red;
    2.65 +}*/
    2.66 +dt{font-weight:bold;}
    2.67 +dd{padding-left:1.5em;}
    2.68 +
    2.69 +li{
    2.70 +    font-size:100%;
    2.71 +    line-height:1.5em;
    2.72 +}
    2.73 +
    2.74 +
    2.75 +div{margin:0!important;padding:0!important;}
    2.76 +/*table{display:none;}*/
    2.77 +.src,.example{margin:0;padding:1em;font-size:1em;line-height:1.5em;
    2.78 +}
    2.79 +.src{background:#000;color:#fff;}
    2.80 +.example{background:#766;color:#fff;padding:.75em}
    2.81 +
    2.82 +
    2.83 +
    2.84 +.header{
    2.85 +    font-family:Arial,Helvetica,Verdana,sans-serif;
    2.86 +    vertical-align:text-top;
    2.87 +    position:absolute;
    2.88 +    top:0px;left:0px;
    2.89 +    right:0px;
    2.90 +    background:#345;
    2.91 +    padding:.75em 1.5em!important;
    2.92 +    border-bottom:1.5em solid #EBD6D6;
    2.93 +    border-bottom-color:#9FB8D3;
    2.94 +    background:#0F4D92;
    2.95 +
    2.96 +    border-bottom:1em solid #cdf;
    2.97 +    background:#444;
    2.98 +    background:#49A;
    2.99 +    background:transparent;
   2.100 +    background:#eef0ff;
   2.101 +
   2.102 +    background:#933;
   2.103 +    background:#A55;
   2.104 +
   2.105 +    border-color:#EDD;
   2.106 +
   2.107 +    /*background: #939; 
   2.108 +    border-color:#EDE;*/
   2.109 +
   2.110 +    /* background:#359; */
   2.111 +    /* border-color:#9AC; */
   2.112 +
   2.113 +}
   2.114 +
   2.115 +
   2.116 +
   2.117 +
   2.118 +
   2.119 +.header h1{
   2.120 +font:1.75em Arial,Helvetica,Verdana,sans-serif;
   2.121 +line-height:1.166em;
   2.122 +font-weight:bold;
   2.123 +color:#b90;
   2.124 +color:#06a;
   2.125 +color:#fff;
   2.126 +
   2.127 +text-shadow: #822 0px 0px 2px;
   2.128 +
   2.129 +font-weight:normal;
   2.130 +display:inline;
   2.131 +}
   2.132 +.header h1 em{
   2.133 +    color:#b90;
   2.134 +    color:#fc2;
   2.135 +    color:#b90;
   2.136 +    color:#db2;
   2.137 +    color:#fd4;
   2.138 +    font-weight:bold;
   2.139 +    font-style:normal;
   2.140 +}
   2.141 +.header * {vertical-align:middle;}
   2.142 +
   2.143 +.header ul {
   2.144 +    display:inline;
   2.145 +    padding-left:1.5em;
   2.146 +    margin-left:0!important;
   2.147 +}
   2.148 +.header li {
   2.149 +    display:inline;
   2.150 +    padding:0 .75em;
   2.151 +}
   2.152 +.header li a{
   2.153 +    text-decoration:none;
   2.154 +    color:#ffd;
   2.155 +}
   2.156 +
   2.157 +
   2.158 +/*dl{display:none;}*/
   2.159 +
   2.160 +
   2.161 +
   2.162 +ol{margin-left:1.5em;}
   2.163 +ul{
   2.164 +    list-style-type: disc;
   2.165 +    margin-left:1.5em;
   2.166 +}
   2.167 +ul ul{
   2.168 +    list-style-type:circle;
   2.169 +}
   2.170 +
   2.171 +#table-of-contents ul{list-style-type:none;}
   2.172 +#text-table-of-contents > ul:first-child > li > a{ font-weight:bold;}
   2.173 +
   2.174 +
   2.175 +
   2.176 +
   2.177 +#postamble p,#postamble a{
   2.178 +    font-size:.857em;
   2.179 +    line-height:1.75em;
   2.180 +    padding:0;
   2.181 +    margin:0;
   2.182 +}
   2.183 +#postamble{
   2.184 +    margin:1.75em 0!important;
   2.185 +    border-top:1px solid #888;
   2.186 +}
   2.187 +
   2.188 +blockquote{
   2.189 +    margin-left:1em;
   2.190 +}
   2.191 +
   2.192 +
   2.193 +
   2.194 +
   2.195 +
   2.196 +
   2.197 +
   2.198 +
   2.199 +
   2.200 +
   2.201 +
   2.202 +/*** blue **/
   2.203 +a{}
   2.204 +.header a{background:inherit;}
   2.205 +h1,h2,h3,h4,h5,h6, #text-table-of-contents li{
   2.206 +    color:#026;
   2.207 +    color:#0A3361;
   2.208 +    font-weight:normal;
   2.209 +}
   2.210 +.header{background:#0F4D92;border-bottom-color:#AFC4DB
   2.211 +}
   2.212 +
   2.213 +/*.header h1{text-shadow: #228 0px 0px 2px;}*/
   2.214 +
   2.215 +
   2.216 +
   2.217 +
   2.218 +
   2.219 +
   2.220 +
   2.221 +
   2.222 +h1,h2,h3,h4,h5,h6{
   2.223 +    color:#373737;
   2.224 +    font-weight:bolder;
   2.225 +}
   2.226 +
   2.227 +h1.title{font-weight:normal;font-size:3em;line-height:1em;}
   2.228 +
   2.229 +body{width:48em;}
   2.230 +img{max-width:48em;}
   2.231 +
   2.232 +body{text-align:justify;
   2.233 +     font:12px "Lucida Grande","Trebuchet MS","Bitstream Vera Sans",Verdana,Helvetica,sans-serif !important;
   2.234 +     color:#272727;
   2.235 +}
   2.236 +code{
   2.237 +    font-weight:inherit;
   2.238 +    color:#048;
   2.239 +    color:black;
   2.240 +    
   2.241 +}
   2.242 +
   2.243 +a{color:#00e}
   2.244 +a:visited{color:#551A8B}
   2.245 +
   2.246 +
   2.247 +.figure {
   2.248 +    background:#ddd;
   2.249 +    border:1px solid #ccc;
   2.250 +    font-size:.90em;
   2.251 +    line-height:1.666em;
   2.252 +    padding:1.5em!important;
   2.253 +    text-align:left!important;
   2.254 +    margin-bottom:1.666em;
   2.255 +}
   2.256 +
   2.257 +.outline-2{
   2.258 +    margin:3em 0!important;
   2.259 +}
   2.260 +
   2.261 +
   2.262 +body{padding-top:9em;padding-left:3em;}
   2.263 +.header{
   2.264 +    padding-left:3!important;
   2.265 +}
   2.266 +.header h1, .header h1 em {
   2.267 +    text-shadow:none;
   2.268 +    font-size:1.5em!important;
   2.269 +}
   2.270 +/*
   2.271 +
   2.272 +.header {
   2.273 +    background:transparent;
   2.274 +    padding-left:3em!important;
   2.275 +    border-bottom:none;
   2.276 +    color:inherit!important;
   2.277 +    background:#dde8ff;
   2.278 +    border-bottom:1px solid #c3d9ff;
   2.279 +}
   2.280 +.header h1, .header h1 em {
   2.281 +    text-shadow:none;
   2.282 +    color:#06c;
   2.283 + 
   2.284 +    font-family:"Georgia Serif", Times, Palatino, "Times New Roman", serif;
   2.285 +}
   2.286 +.header li a {
   2.287 +    color:inherit!important;
   2.288 +    text-decoration:underline;
   2.289 +}
   2.290 +
   2.291 +#text-table-of-contents a {
   2.292 +  
   2.293 +}
   2.294 \ No newline at end of file

     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/css/argentum-light.css	Sat Jul 13 08:03:56 2013 +0100
     3.3 @@ -0,0 +1,289 @@
     3.4 +
     3.5 +/** RESETS **/
     3.6 +
     3.7 +html,body,div,span,dl,dt,dd,ul,ol,li,a,table,h1,h2,h3,h4,h5,h6,p,pre,form,fieldset,blockquote,.src,.example{margin:0px;padding:0px;font-weight:normal;text-decoration:none;font-size:inherit;color:inherit;}
     3.8 +
     3.9 +.section-number-1,.section-number-2,.section-number-3,.section-number-4,.section-number-5,.section-number-6{font-weight:inherit;}
    3.10 +
    3.11 +.float-right{float:right;}
    3.12 +
    3.13 +.author{
    3.14 +color:#666;
    3.15 +line-height:3em;
    3.16 +}
    3.17 +
    3.18 +body{
    3.19 +    font:87.5% "Georgia Serif", Times, Palatino, "Times New Roman", serif;
    3.20 +}
    3.21 +a{color:blue;}
    3.22 +html>body{font-size:14px;}
    3.23 +
    3.24 +body{
    3.25 +    width:54em;
    3.26 +    padding:1.5em;
    3.27 +    padding-top:6em;
    3.28 +
    3.29 +}
    3.30 +
    3.31 +p{
    3.32 +    line-height:1.5em;
    3.33 +    font-size:1em;
    3.34 +    margin-top:1.5em;
    3.35 +    margin-bottom:1.5em;
    3.36 +}
    3.37 +.post_list{
    3.38 +    margin-top:1.5em;
    3.39 +}
    3.40 +
    3.41 +.title{text-align:left;}
    3.42 +
    3.43 +
    3.44 +
    3.45 +h1{font-size:2.5em;line-height:1.2em;}
    3.46 +h2{font-size:1.5em;line-height:1em;margin-top:2em;margin-bottom:1em;}
    3.47 +h3{
    3.48 +    font-size:1.1667em;
    3.49 +    line-height: 1.286em;
    3.50 +    margin-top:1.929em;
    3.51 +    margin-bottom:0.643em;
    3.52 +    font-weight:bolder;
    3.53 +}
    3.54 +h4{
    3.55 +    font-weight:bold;
    3.56 +    line-height:3em;
    3.57 +}
    3.58 +
    3.59 +
    3.60 +
    3.61 +
    3.62 +/*p + dl{
    3.63 +    margin-top:-1.5em;
    3.64 +    border:1px solid red;
    3.65 +}*/
    3.66 +dt{font-weight:bold;}
    3.67 +dd{padding-left:1.5em;}
    3.68 +
    3.69 +li{
    3.70 +    font-size:100%;
    3.71 +    line-height:1.5em;
    3.72 +}
    3.73 +
    3.74 +
    3.75 +div{margin:0!important;padding:0!important;}
    3.76 +/*table{display:none;}*/
    3.77 +.src,.example{margin:0;padding:1em;font-size:1em;line-height:1.5em;
    3.78 +}
    3.79 +.example{background:#766;color:#fff;padding:.75em}
    3.80 +
    3.81 +
    3.82 +
    3.83 +.header{
    3.84 +    font-family:Arial,Helvetica,Verdana,sans-serif;
    3.85 +    vertical-align:text-top;
    3.86 +    position:absolute;
    3.87 +    top:0px;left:0px;
    3.88 +    right:0px;
    3.89 +    background:#345;
    3.90 +    padding:.75em 1.5em!important;
    3.91 +    border-bottom:1.5em solid #EBD6D6;
    3.92 +    border-bottom-color:#9FB8D3;
    3.93 +    background:#0F4D92;
    3.94 +
    3.95 +    border-bottom:1em solid #cdf;
    3.96 +    background:#444;
    3.97 +    background:#49A;
    3.98 +    background:transparent;
    3.99 +    background:#eef0ff;
   3.100 +
   3.101 +    background:#933;
   3.102 +    background:#A55;
   3.103 +
   3.104 +    border-color:#EDD;
   3.105 +
   3.106 +    /*background: #939; 
   3.107 +    border-color:#EDE;*/
   3.108 +
   3.109 +    /* background:#359; */
   3.110 +    /* border-color:#9AC; */
   3.111 +
   3.112 +}
   3.113 +
   3.114 +
   3.115 +
   3.116 +
   3.117 +
   3.118 +.header h1{
   3.119 +font:1.75em Arial,Helvetica,Verdana,sans-serif;
   3.120 +line-height:1.166em;
   3.121 +font-weight:bold;
   3.122 +color:#b90;
   3.123 +color:#06a;
   3.124 +color:#fff;
   3.125 +
   3.126 +text-shadow: #822 0px 0px 2px;
   3.127 +
   3.128 +font-weight:normal;
   3.129 +display:inline;
   3.130 +}
   3.131 +.header h1 em{
   3.132 +    color:#b90;
   3.133 +    color:#fc2;
   3.134 +    color:#b90;
   3.135 +    color:#db2;
   3.136 +    color:#fd4;
   3.137 +    font-weight:bold;
   3.138 +    font-style:normal;
   3.139 +}
   3.140 +.header * {vertical-align:middle;}
   3.141 +
   3.142 +.header ul {
   3.143 +    display:inline;
   3.144 +    padding-left:1.5em;
   3.145 +    margin-left:0!important;
   3.146 +}
   3.147 +.header li {
   3.148 +    display:inline;
   3.149 +    padding:0 .75em;
   3.150 +}
   3.151 +.header li a{
   3.152 +    text-decoration:none;
   3.153 +    color:#ffd;
   3.154 +}
   3.155 +
   3.156 +
   3.157 +/*dl{display:none;}*/
   3.158 +
   3.159 +
   3.160 +
   3.161 +ol{margin-left:1.5em;}
   3.162 +ul{
   3.163 +    list-style-type: disc;
   3.164 +    margin-left:1.5em;
   3.165 +}
   3.166 +ul ul{
   3.167 +    list-style-type:circle;
   3.168 +}
   3.169 +
   3.170 +#table-of-contents ul{list-style-type:none;}
   3.171 +#text-table-of-contents > ul:first-child > li > a{ font-weight:bold;}
   3.172 +
   3.173 +
   3.174 +
   3.175 +
   3.176 +#postamble p,#postamble a{
   3.177 +    font-size:.857em;
   3.178 +    line-height:1.75em;
   3.179 +    padding:0;
   3.180 +    margin:0;
   3.181 +}
   3.182 +#postamble{
   3.183 +    margin:1.75em 0!important;
   3.184 +    border-top:1px solid #888;
   3.185 +}
   3.186 +
   3.187 +blockquote{
   3.188 +    margin-left:1em;
   3.189 +}
   3.190 +
   3.191 +
   3.192 +
   3.193 +
   3.194 +
   3.195 +
   3.196 +
   3.197 +
   3.198 +
   3.199 +
   3.200 +
   3.201 +/*** blue **/
   3.202 +a{}
   3.203 +.header a{background:inherit;}
   3.204 +h1,h2,h3,h4,h5,h6, #text-table-of-contents li{
   3.205 +    color:#026;
   3.206 +    color:#0A3361;
   3.207 +    font-weight:normal;
   3.208 +}
   3.209 +.header{background:#0F4D92;border-bottom-color:#AFC4DB
   3.210 +}
   3.211 +
   3.212 +/*.header h1{text-shadow: #228 0px 0px 2px;}*/
   3.213 +
   3.214 +
   3.215 +
   3.216 +
   3.217 +
   3.218 +
   3.219 +
   3.220 +
   3.221 +h1,h2,h3,h4,h5,h6{
   3.222 +    color:#373737;
   3.223 +    font-weight:bolder;
   3.224 +}
   3.225 +
   3.226 +h1.title{font-weight:normal;font-size:3em;line-height:1em;}
   3.227 +
   3.228 +body{width:48em;}
   3.229 +img{max-width:48em;}
   3.230 +
   3.231 +body{text-align:justify;
   3.232 +     font:12px "Lucida Grande","Trebuchet MS","Bitstream Vera Sans",Verdana,Helvetica,sans-serif !important;
   3.233 +     color:#272727;
   3.234 +}
   3.235 +code{
   3.236 +    font-weight:inherit;
   3.237 +    color:#048;
   3.238 +    color:black;
   3.239 +    
   3.240 +}
   3.241 +
   3.242 +a{color:#00e}
   3.243 +a:visited{color:#551A8B}
   3.244 +
   3.245 +
   3.246 +.figure {
   3.247 +    background:#ddd;
   3.248 +    border:1px solid #ccc;
   3.249 +    font-size:.90em;
   3.250 +    line-height:1.666em;
   3.251 +    padding:1.5em!important;
   3.252 +    text-align:left!important;
   3.253 +    margin-bottom:1.666em;
   3.254 +}
   3.255 +
   3.256 +.outline-2{
   3.257 +    margin:3em 0!important;
   3.258 +}
   3.259 +
   3.260 +
   3.261 +body{padding-top:9em;padding-left:3em;}
   3.262 +.header{
   3.263 +    padding-left:3!important;
   3.264 +}
   3.265 +.header h1, .header h1 em {
   3.266 +    text-shadow:none;
   3.267 +    font-size:1.5em!important;
   3.268 +}
   3.269 +/*
   3.270 +
   3.271 +.header {
   3.272 +    background:transparent;
   3.273 +    padding-left:3em!important;
   3.274 +    border-bottom:none;
   3.275 +    color:inherit!important;
   3.276 +    background:#dde8ff;
   3.277 +    border-bottom:1px solid #c3d9ff;
   3.278 +}
   3.279 +.header h1, .header h1 em {
   3.280 +    text-shadow:none;
   3.281 +    color:#06c;
   3.282 + 
   3.283 +    font-family:"Georgia Serif", Times, Palatino, "Times New Roman", serif;
   3.284 +}
   3.285 +.header li a {
   3.286 +    color:inherit!important;
   3.287 +    text-decoration:underline;
   3.288 +}
   3.289 +
   3.290 +#text-table-of-contents a {
   3.291 +  
   3.292 +}
   3.293 \ No newline at end of file

     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/css/aurellem-dark.css	Sat Jul 13 08:03:56 2013 +0100
     4.3 @@ -0,0 +1,364 @@
     4.4 +
     4.5 +html,body,div,span,dl,dt,dd,ul,ol,li,a,table,h1,h2,h3,h4,h5,h6,p,pre,form,fieldset,blockquote,.src,.example{margin:0px;padding:0px;font-weight:normal;text-decoration:none;font-size:inherit;color:inherit;}
     4.6 +
     4.7 +.section-number-1,.section-number-2,.section-number-3,.section-number-4,.section-number-5,.section-number-6{font-weight:inherit;}
     4.8 +
     4.9 +.float-right{float:right;}
    4.10 +
    4.11 +.author{
    4.12 +color:#666;
    4.13 +line-height:3em;
    4.14 +}
    4.15 +
    4.16 +body{
    4.17 +    font:87.5% "Georgia Serif", Times, Palatino, "Times New Roman", serif;
    4.18 +}
    4.19 +a{color:blue;}
    4.20 +html>body{font-size:14px;}
    4.21 +
    4.22 +body{
    4.23 +    width:54em;
    4.24 +    padding:1.5em;
    4.25 +    padding-top:6em;
    4.26 +
    4.27 +}
    4.28 +
    4.29 +p{
    4.30 +    line-height:1.5em;
    4.31 +    font-size:1em;
    4.32 +    margin-top:1.5em;
    4.33 +    margin-bottom:1.5em;
    4.34 +}
    4.35 +.post_list{
    4.36 +    margin-top:1.5em;
    4.37 +}
    4.38 +
    4.39 +.title{text-align:left;}
    4.40 +
    4.41 +
    4.42 +
    4.43 +h1{font-size:2.5em;line-height:1.2em;}
    4.44 +h2{font-size:1.5em;line-height:1em;margin-top:2em;margin-bottom:1em;}
    4.45 +h3{
    4.46 +    font-size:1.1667em;
    4.47 +    line-height: 1.286em;
    4.48 +    margin-top:1.929em;
    4.49 +    margin-bottom:0.643em;
    4.50 +    font-weight:bolder;
    4.51 +}
    4.52 +h4{
    4.53 +    font-weight:bold;
    4.54 +    line-height:3em;
    4.55 +}
    4.56 +
    4.57 +
    4.58 +
    4.59 +
    4.60 +/*p + dl{
    4.61 +    margin-top:-1.5em;
    4.62 +    border:1px solid red;
    4.63 +}*/
    4.64 +dt{font-weight:bold;}
    4.65 +dd{padding-left:1.5em;}
    4.66 +
    4.67 +li{
    4.68 +    font-size:100%;
    4.69 +    line-height:1.5em;
    4.70 +}
    4.71 +
    4.72 +
    4.73 +div{margin:0!important;padding:0!important;}
    4.74 +/*table{display:none;}*/
    4.75 +.src,.example{margin:0;padding:1em;font-size:1em;line-height:1.5em;
    4.76 +}
    4.77 +.src{background:#444;color:#fff;}
    4.78 +.example{background:#766;color:#fff;padding:.75em}
    4.79 +
    4.80 +
    4.81 +.header{
    4.82 +    font-family:Arial,Helvetica,Verdana,sans-serif;
    4.83 +    vertical-align:text-top;
    4.84 +    position:absolute;
    4.85 +    top:0px;left:0px;
    4.86 +    right:0px;
    4.87 +    background:#345;
    4.88 +    padding:.75em 1.5em!important;
    4.89 +    border-bottom:1.5em solid #EBD6D6;
    4.90 +    border-bottom-color:#9FB8D3;
    4.91 +    background:#0F4D92;
    4.92 +
    4.93 +    border-bottom:1em solid #cdf;
    4.94 +    background:#444;
    4.95 +    background:#49A;
    4.96 +    background:transparent;
    4.97 +    background:#eef0ff;
    4.98 +
    4.99 +    background:#933;
   4.100 +    background:#A55;
   4.101 +
   4.102 +    border-color:#EDD;
   4.103 +
   4.104 +    /*background: #939; 
   4.105 +    border-color:#EDE;*/
   4.106 +
   4.107 +    /* background:#359; */
   4.108 +    /* border-color:#9AC; */
   4.109 +
   4.110 +}
   4.111 +
   4.112 +
   4.113 +
   4.114 +
   4.115 +
   4.116 +.header h1{
   4.117 +font:1.75em Arial,Helvetica,Verdana,sans-serif;
   4.118 +line-height:1.166em;
   4.119 +font-weight:bold;
   4.120 +color:#b90;
   4.121 +color:#06a;
   4.122 +color:#fff;
   4.123 +
   4.124 +text-shadow: #822 0px 0px 2px;
   4.125 +
   4.126 +font-weight:normal;
   4.127 +display:inline;
   4.128 +}
   4.129 +.header h1 em{
   4.130 +    color:#b90;
   4.131 +    color:#fc2;
   4.132 +    color:#b90;
   4.133 +    color:#db2;
   4.134 +    color:#fd4;
   4.135 +    font-weight:bold;
   4.136 +    font-style:normal;
   4.137 +}
   4.138 +.header * {vertical-align:middle;}
   4.139 +
   4.140 +.header ul {
   4.141 +    display:inline;
   4.142 +    padding-left:1.5em;
   4.143 +    margin-left:0!important;
   4.144 +}
   4.145 +.header li {
   4.146 +    display:inline;
   4.147 +    padding:0 .75em;
   4.148 +}
   4.149 +.header li a{
   4.150 +    text-decoration:none;
   4.151 +    color:#ffd;
   4.152 +}
   4.153 +
   4.154 +/*dl{display:none;}*/
   4.155 +
   4.156 +
   4.157 +
   4.158 +ol{margin-left:1.5em;}
   4.159 +ul{
   4.160 +    list-style-type: disc;
   4.161 +    margin-left:1.5em;
   4.162 +}
   4.163 +ul ul{
   4.164 +    list-style-type:circle;
   4.165 +}
   4.166 +
   4.167 +#table-of-contents ul{list-style-type:none;}
   4.168 +#text-table-of-contents > ul:first-child > li > a{ font-weight:bold;}
   4.169 +
   4.170 +
   4.171 +
   4.172 +
   4.173 +#postamble p,#postamble a{
   4.174 +    font-size:.857em;
   4.175 +    line-height:1.75em;
   4.176 +    padding:0;
   4.177 +    margin:0;
   4.178 +}
   4.179 +#postamble{
   4.180 +    margin:1.75em 0!important;
   4.181 +    border-top:1px solid #888;
   4.182 +}
   4.183 +
   4.184 +blockquote{
   4.185 +    margin-left:1em;
   4.186 +}
   4.187 +
   4.188 +
   4.189 +
   4.190 +
   4.191 +
   4.192 +
   4.193 +
   4.194 +
   4.195 +
   4.196 +
   4.197 +
   4.198 +/*** blue **/
   4.199 +a{}
   4.200 +.header a{background:inherit;}
   4.201 +h1,h2,h3,h4,h5,h6, #text-table-of-contents li{
   4.202 +    color:#026;
   4.203 +    color:#0A3361;
   4.204 +    font-weight:normal;
   4.205 +}
   4.206 +.header{background:#0F4D92;border-bottom-color:#AFC4DB
   4.207 +}
   4.208 +.header h1{text-shadow: #228 0px 0px 2px;}
   4.209 +
   4.210 +
   4.211 +/** STOP CENSORSHIP!
   4.212 +*:nth-child(odd):before{content:"[censored] "}
   4.213 +h1:after{content:"[[ stopthewall.us ]]"}
   4.214 +.censor{
   4.215 +    position:fixed;
   4.216 +    text-align:center;
   4.217 +    top:4em;
   4.218 +    background:black;
   4.219 +    padding:1em;
   4.220 +    text-shadow:none!important;
   4.221 +    color:white!important;
   4.222 +}
   4.223 +
   4.224 +/*
   4.225 +
   4.226 +
   4.227 +ul ul {margin-left:1em;}
   4.228 +
   4.229 +dt{font-weight:normal;font-style:italic;}
   4.230 +dl{margin:0;padding:0;margin-left:2em;}
   4.231 +
   4.232 +.src{background:#555;color:white;margin:0;line-height:1.5em!important;}
   4.233 +.example{background:#766;color:white;
   4.234 +margin:0;overflow:hidden;}
   4.235 +
   4.236 +
   4.237 +body{
   4.238 +    font:14px Georgia Serif, Times, Palatino,"Times New Roman", serif;
   4.239 +    font:13px Georgia, Times, "Times New Roman", Verdana, Tahoma, Helvetica;
   4.240 +    width:600px;
   4.241 +    margin:24px auto;
   4.242 +    line-height:1.5em;
   4.243 +    color:#111;
   4.244 +}
   4.245 +
   4.246 +code{}
   4.247 +a code{color:inherit;font-weight:inherit;}
   4.248 +
   4.249 +.float-right{float:right;}
   4.250 +
   4.251 +
   4.252 +
   4.253 +
   4.254 +
   4.255 +
   4.256 +/*** GLOBAL HEADER **
   4.257 +div.header{margin-bottom:2em;}
   4.258 +.header h1{font-family:Ubuntu, Arial, Helvetica, Verdana, sans-serif;font-size:160%!important;margin:0!important;margin-bottom:6px!important;font-weight:normal!important;color:#983;}
   4.259 +.header .nav ul{display:inline;}
   4.260 +.header .nav li{display:inline;margin-right:0.75em;}
   4.261 +.header .nav li a:hover{text-decoration:underline;}
   4.262 +.header .nav li a{color:#555;}
   4.263 +
   4.264 +/*** ARTICLE CONTENT 
   4.265 + h1{
   4.266 +    font-size:170%;
   4.267 +    margin-top:2em;
   4.268 +    margin-bottom:0.5em;
   4.269 +    font-weight:bold;
   4.270 +}
   4.271 +h2{
   4.272 +    font-size:120%;
   4.273 +    font-weight:bold;
   4.274 +    margin-bottom:0.375em;
   4.275 +    padding-top:1.6em;
   4.276 +    border:0px solid red;
   4.277 +}
   4.278 +h4{font-size:100%;font-weight:bold;}
   4.279 +
   4.280 +h3{
   4.281 +    font-size:110%;
   4.282 +    font-weight:bold;
   4.283 +    margin-bottom:0.75em;
   4.284 +    padding-top:1.8em;
   4.285 +}
   4.286 +
   4.287 +.section-number-1,.section-number-3,.section-number-2,.section-number-4{font-weight:inherit}
   4.288 +
   4.289 +
   4.290 +#table-of-contents{
   4.291 +    margin:1.5em 0;
   4.292 +}
   4.293 +
   4.294 +h1,h2,h3,h4,h5,h6,p{margin:2px 0;padding:0;}
   4.295 +
   4.296 +h2{margin-top:1.8em;}
   4.297 +p{margin-bottom:7px}
   4.298 +
   4.299 +/*
   4.300 +.header h1{font-family:Ubuntu,Arial,Helvetica,Verdana,sans-serif;}
   4.301 +
   4.302 +body{margin:24px 24px;font:14px Arial, Helvetia,Verdana, sans-serif;width:860px;margin:0px auto;}
   4.303 +h1,h2,h3,h4,h5,h6,.nav a{}
   4.304 +h1{font-size:200%;}
   4.305 +h2{}
   4.306 +	
   4.307 +.header{margin-bottom:2em;}
   4.308 +.nav li{display:inline;padding-right:0.75em;}
   4.309 +.nav li a:hover{text-decoration:underline;}	
   4.310 +.float-right{float:right;}
   4.311 +.header .float-right input{display:inline;}	
   4.312 +
   4.313 +input[type="text"]{margin-right:4px;padding:3px;}
   4.314 +	
   4.315 +.src {padding:4px; padding-left:2em;border:1px solid #777;background:#444;color:white;}
   4.316 +
   4.317 +
   4.318 +
   4.319 +
   4.320 +/*** ARTICLE CONTENT TEST ***/
   4.321 +
   4.322 +
   4.323 +
   4.324 +/**ARTICLE
   4.325 +
   4.326 +#content{line-height:1.2em;}
   4.327 +#content h1{font-size:140%;font-size:180%;margin-bottom:1.6em;padding-bottom:.4em;text-align:left;border-bottom:1px solid transparent;}
   4.328 +#content h2{font-size:120%;font-weight:bold;margin-bottom:6px;margin-bottom:12px;margin-top:3em;}
   4.329 +#content p{margin-bottom:1em;}
   4.330 +#content p:first-letter{margin-left:2em;}
   4.331 +
   4.332 +#content h2 > #content p:first-letter{margin-left:0px;}
   4.333 +
   4.334 +
   4.335 +
   4.336 +
   4.337 +
   4.338 +
   4.339 +/*** LIGHT COLOR SCHEME
   4.340 +body{background:#fff;color:#222;}	
   4.341 +h1{color:#982;}
   4.342 +.nav li a{color:#555;}
   4.343 +#article h1, #article h2, #article h3, #article h4 {color:#57e;color:#48b;color:#489;}
   4.344 +
   4.345 +#article h1{border-bottom-color:#e30;border-bottom-color:#888;}
   4.346 +
   4.347 +
   4.348 +
   4.349 +/*<body class="darke"><div id="contain-everything">
   4.350 +<div class="header">
   4.351 +<div class="float-right">	
   4.352 +
   4.353 +<form>
   4.354 +<input type="text"/><input type="submit" value="search the blog &raquo;"/> 
   4.355 +</form>
   4.356 +</div>
   4.357 +
   4.358 +<h1>aurellem &#x2609;</h1>
   4.359 +<ul class="nav">
   4.360 +<li><a href="#">read the blog &raquo;</a></li>
   4.361 +<li><a href="#">learn about us &raquo;</a></li>
   4.362 +</ul>
   4.363 +</div>
   4.364 +<div id="article">
   4.365 +
   4.366 +</div></body>	
   4.367 +</html>*/
   4.368 \ No newline at end of file

     5.1 --- a/css/aurellem.css	Sat Jul 13 03:01:04 2013 -0400
     5.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.3 @@ -1,351 +0,0 @@
     5.4 -
     5.5 -html,body,div,span,dl,dt,dd,ul,ol,li,a,table,h1,h2,h3,h4,h5,h6,p,pre,form,fieldset,blockquote,.src,.example{margin:0px;padding:0px;font-weight:normal;text-decoration:none;font-size:inherit;color:inherit;}
     5.6 -
     5.7 -.section-number-1,.section-number-2,.section-number-3,.section-number-4,.section-number-5,.section-number-6{font-weight:inherit;}
     5.8 -
     5.9 -.float-right{float:right;}
    5.10 -
    5.11 -.author{
    5.12 -color:#666;
    5.13 -line-height:3em;
    5.14 -}
    5.15 -
    5.16 -body{
    5.17 -    font:87.5% "Georgia Serif", Times, Palatino, "Times New Roman", serif;
    5.18 -}
    5.19 -a{color:blue;}
    5.20 -html>body{font-size:14px;}
    5.21 -
    5.22 -body{
    5.23 -    width:54em;
    5.24 -    padding:1.5em;
    5.25 -    padding-top:6em;
    5.26 -
    5.27 -}
    5.28 -
    5.29 -p{
    5.30 -    line-height:1.5em;
    5.31 -    font-size:1em;
    5.32 -    margin-top:1.5em;
    5.33 -    margin-bottom:1.5em;
    5.34 -}
    5.35 -.post_list{
    5.36 -    margin-top:1.5em;
    5.37 -}
    5.38 -
    5.39 -.title{text-align:left;}
    5.40 -
    5.41 -
    5.42 -
    5.43 -h1{font-size:2.5em;line-height:1.2em;}
    5.44 -h2{font-size:1.5em;line-height:1em;margin-top:2em;margin-bottom:1em;}
    5.45 -h3{
    5.46 -    font-size:1.1667em;
    5.47 -    line-height: 1.286em;
    5.48 -    margin-top:1.929em;
    5.49 -    margin-bottom:0.643em;
    5.50 -    font-weight:bolder;
    5.51 -}
    5.52 -h4{
    5.53 -    font-weight:bold;
    5.54 -    line-height:3em;
    5.55 -}
    5.56 -
    5.57 -
    5.58 -
    5.59 -
    5.60 -/*p + dl{
    5.61 -    margin-top:-1.5em;
    5.62 -    border:1px solid red;
    5.63 -}*/
    5.64 -dt{font-weight:bold;}
    5.65 -dd{padding-left:1.5em;}
    5.66 -
    5.67 -li{
    5.68 -    font-size:100%;
    5.69 -    line-height:1.5em;
    5.70 -}
    5.71 -
    5.72 -
    5.73 -div{margin:0!important;padding:0!important;}
    5.74 -/*table{display:none;}*/
    5.75 -.src,.example{margin:0;padding:1em;font-size:1em;line-height:1.5em;
    5.76 -}
    5.77 -.src{background:#444;color:#fff;}
    5.78 -.example{background:#766;color:#fff;padding:.75em}
    5.79 -
    5.80 -
    5.81 -.header{
    5.82 -    font-family:Arial,Helvetica,Verdana,sans-serif;
    5.83 -    vertical-align:text-top;
    5.84 -    position:absolute;
    5.85 -    top:0px;left:0px;
    5.86 -    right:0px;
    5.87 -    background:#345;
    5.88 -    padding:.75em 1.5em!important;
    5.89 -    border-bottom:1.5em solid #EBD6D6;
    5.90 -    border-bottom-color:#9FB8D3;
    5.91 -    background:#0F4D92;
    5.92 -
    5.93 -    border-bottom:1em solid #cdf;
    5.94 -    background:#444;
    5.95 -    background:#49A;
    5.96 -    background:transparent;
    5.97 -    background:#eef0ff;
    5.98 -
    5.99 -    background:#933;
   5.100 -    background:#A55;
   5.101 -
   5.102 -    border-color:#EDD;
   5.103 -
   5.104 -    /*background: #939; 
   5.105 -    border-color:#EDE;*/
   5.106 -
   5.107 -    /* background:#359; */
   5.108 -    /* border-color:#9AC; */
   5.109 -
   5.110 -}
   5.111 -
   5.112 -
   5.113 -
   5.114 -
   5.115 -
   5.116 -.header h1{
   5.117 -font:1.75em Arial,Helvetica,Verdana,sans-serif;
   5.118 -line-height:1.166em;
   5.119 -font-weight:bold;
   5.120 -color:#b90;
   5.121 -color:#06a;
   5.122 -color:#fff;
   5.123 -
   5.124 -text-shadow: #822 0px 0px 2px;
   5.125 -
   5.126 -font-weight:normal;
   5.127 -display:inline;
   5.128 -}
   5.129 -.header h1 em{
   5.130 -    color:#b90;
   5.131 -    color:#fc2;
   5.132 -    color:#b90;
   5.133 -    color:#db2;
   5.134 -    color:#fd4;
   5.135 -    font-weight:bold;
   5.136 -    font-style:normal;
   5.137 -}
   5.138 -.header * {vertical-align:middle;}
   5.139 -
   5.140 -.header ul {
   5.141 -    display:inline;
   5.142 -    padding-left:1.5em;
   5.143 -    margin-left:0!important;
   5.144 -}
   5.145 -.header li {
   5.146 -    display:inline;
   5.147 -    padding:0 .75em;
   5.148 -}
   5.149 -.header li a{
   5.150 -    text-decoration:none;
   5.151 -    color:#ffd;
   5.152 -}
   5.153 -
   5.154 -/*dl{display:none;}*/
   5.155 -
   5.156 -
   5.157 -
   5.158 -ol{margin-left:1.5em;}
   5.159 -ul{
   5.160 -    list-style-type: disc;
   5.161 -    margin-left:1.5em;
   5.162 -}
   5.163 -ul ul{
   5.164 -    list-style-type:circle;
   5.165 -}
   5.166 -
   5.167 -#table-of-contents ul{list-style-type:none;}
   5.168 -#text-table-of-contents > ul:first-child > li > a{ font-weight:bold;}
   5.169 -
   5.170 -
   5.171 -
   5.172 -
   5.173 -#postamble p,#postamble a{
   5.174 -    font-size:.857em;
   5.175 -    line-height:1.75em;
   5.176 -    padding:0;
   5.177 -    margin:0;
   5.178 -}
   5.179 -#postamble{
   5.180 -    margin:1.75em 0!important;
   5.181 -    border-top:1px solid #888;
   5.182 -}
   5.183 -
   5.184 -blockquote{
   5.185 -    margin-left:1em;
   5.186 -}
   5.187 -
   5.188 -
   5.189 -
   5.190 -
   5.191 -
   5.192 -
   5.193 -
   5.194 -
   5.195 -
   5.196 -
   5.197 -
   5.198 -/*** blue **/
   5.199 -a{}
   5.200 -.header a{background:inherit;}
   5.201 -h1,h2,h3,h4,h5,h6, #text-table-of-contents li{
   5.202 -    color:#026;
   5.203 -    color:#0A3361;
   5.204 -    font-weight:normal;
   5.205 -}
   5.206 -.header{background:#0F4D92;border-bottom-color:#AFC4DB
   5.207 -}
   5.208 -.header h1{text-shadow: #228 0px 0px 2px;}
   5.209 -
   5.210 -
   5.211 -/*
   5.212 -
   5.213 -
   5.214 -ul ul {margin-left:1em;}
   5.215 -
   5.216 -dt{font-weight:normal;font-style:italic;}
   5.217 -dl{margin:0;padding:0;margin-left:2em;}
   5.218 -
   5.219 -.src{background:#555;color:white;margin:0;line-height:1.5em!important;}
   5.220 -.example{background:#766;color:white;
   5.221 -margin:0;overflow:hidden;}
   5.222 -
   5.223 -
   5.224 -body{
   5.225 -    font:14px Georgia Serif, Times, Palatino,"Times New Roman", serif;
   5.226 -    font:13px Georgia, Times, "Times New Roman", Verdana, Tahoma, Helvetica;
   5.227 -    width:600px;
   5.228 -    margin:24px auto;
   5.229 -    line-height:1.5em;
   5.230 -    color:#111;
   5.231 -}
   5.232 -
   5.233 -code{}
   5.234 -a code{color:inherit;font-weight:inherit;}
   5.235 -
   5.236 -.float-right{float:right;}
   5.237 -
   5.238 -
   5.239 -
   5.240 -
   5.241 -
   5.242 -
   5.243 -/*** GLOBAL HEADER **
   5.244 -div.header{margin-bottom:2em;}
   5.245 -.header h1{font-family:Ubuntu, Arial, Helvetica, Verdana, sans-serif;font-size:160%!important;margin:0!important;margin-bottom:6px!important;font-weight:normal!important;color:#983;}
   5.246 -.header .nav ul{display:inline;}
   5.247 -.header .nav li{display:inline;margin-right:0.75em;}
   5.248 -.header .nav li a:hover{text-decoration:underline;}
   5.249 -.header .nav li a{color:#555;}
   5.250 -
   5.251 -/*** ARTICLE CONTENT 
   5.252 - h1{
   5.253 -    font-size:170%;
   5.254 -    margin-top:2em;
   5.255 -    margin-bottom:0.5em;
   5.256 -    font-weight:bold;
   5.257 -}
   5.258 -h2{
   5.259 -    font-size:120%;
   5.260 -    font-weight:bold;
   5.261 -    margin-bottom:0.375em;
   5.262 -    padding-top:1.6em;
   5.263 -    border:0px solid red;
   5.264 -}
   5.265 -h4{font-size:100%;font-weight:bold;}
   5.266 -
   5.267 -h3{
   5.268 -    font-size:110%;
   5.269 -    font-weight:bold;
   5.270 -    margin-bottom:0.75em;
   5.271 -    padding-top:1.8em;
   5.272 -}
   5.273 -
   5.274 -.section-number-1,.section-number-3,.section-number-2,.section-number-4{font-weight:inherit}
   5.275 -
   5.276 -
   5.277 -#table-of-contents{
   5.278 -    margin:1.5em 0;
   5.279 -}
   5.280 -
   5.281 -h1,h2,h3,h4,h5,h6,p{margin:2px 0;padding:0;}
   5.282 -
   5.283 -h2{margin-top:1.8em;}
   5.284 -p{margin-bottom:7px}
   5.285 -
   5.286 -/*
   5.287 -.header h1{font-family:Ubuntu,Arial,Helvetica,Verdana,sans-serif;}
   5.288 -
   5.289 -body{margin:24px 24px;font:14px Arial, Helvetia,Verdana, sans-serif;width:860px;margin:0px auto;}
   5.290 -h1,h2,h3,h4,h5,h6,.nav a{}
   5.291 -h1{font-size:200%;}
   5.292 -h2{}
   5.293 -	
   5.294 -.header{margin-bottom:2em;}
   5.295 -.nav li{display:inline;padding-right:0.75em;}
   5.296 -.nav li a:hover{text-decoration:underline;}	
   5.297 -.float-right{float:right;}
   5.298 -.header .float-right input{display:inline;}	
   5.299 -
   5.300 -input[type="text"]{margin-right:4px;padding:3px;}
   5.301 -	
   5.302 -.src {padding:4px; padding-left:2em;border:1px solid #777;background:#444;color:white;}
   5.303 -
   5.304 -
   5.305 -
   5.306 -
   5.307 -/*** ARTICLE CONTENT ***/
   5.308 -
   5.309 -
   5.310 -
   5.311 -/**ARTICLE
   5.312 -
   5.313 -#content{line-height:1.2em;}
   5.314 -#content h1{font-size:140%;font-size:180%;margin-bottom:1.6em;padding-bottom:.4em;text-align:left;border-bottom:1px solid transparent;}
   5.315 -#content h2{font-size:120%;font-weight:bold;margin-bottom:6px;margin-bottom:12px;margin-top:3em;}
   5.316 -#content p{margin-bottom:1em;}
   5.317 -#content p:first-letter{margin-left:2em;}
   5.318 -
   5.319 -#content h2 > #content p:first-letter{margin-left:0px;}
   5.320 -
   5.321 -
   5.322 -
   5.323 -
   5.324 -
   5.325 -
   5.326 -/*** LIGHT COLOR SCHEME
   5.327 -body{background:#fff;color:#222;}	
   5.328 -h1{color:#982;}
   5.329 -.nav li a{color:#555;}
   5.330 -#article h1, #article h2, #article h3, #article h4 {color:#57e;color:#48b;color:#489;}
   5.331 -
   5.332 -#article h1{border-bottom-color:#e30;border-bottom-color:#888;}
   5.333 -
   5.334 -
   5.335 -
   5.336 -/*<body class="darke"><div id="contain-everything">
   5.337 -<div class="header">
   5.338 -<div class="float-right">	
   5.339 -
   5.340 -<form>
   5.341 -<input type="text"/><input type="submit" value="search the blog &raquo;"/> 
   5.342 -</form>
   5.343 -</div>
   5.344 -
   5.345 -<h1>aurellem &#x2609;</h1>
   5.346 -<ul class="nav">
   5.347 -<li><a href="#">read the blog &raquo;</a></li>
   5.348 -<li><a href="#">learn about us &raquo;</a></li>
   5.349 -</ul>
   5.350 -</div>
   5.351 -<div id="article">
   5.352 -
   5.353 -</div></body>	
   5.354 -</html>*/
   5.355 \ No newline at end of file

     6.1 --- a/org/index.org	Sat Jul 13 03:01:04 2013 -0400
     6.2 +++ b/org/index.org	Sat Jul 13 08:03:56 2013 +0100
     6.3 @@ -8,9 +8,14 @@
     6.4  #+OPTIONS: toc:nil, num:nil
     6.5  
     6.6  ** Adventures in coding
     6.7 +<<<<<<< local
     6.8 +- [[../abomination/html/no_parens.html][Calling it quits without parentheses]]
     6.9 +- [[../cortex/html/capture-video.html][Capture live video feeds from JMonkeyEngine]]
    6.10 +=======
    6.11    - [[../abomination/html/no_parens.html][Calling it quits without parentheses]]
    6.12    - [[../cortex/html/capture-video.html][Capture live video feeds from JMonkeyEngine]]
    6.13  
    6.14 +>>>>>>> other
    6.15  ** Academic
    6.16    - [[../dylan/html/quandary.html][Bugs in quantum mechanics]]
    6.17    - [[../dylan/html/visualizing-reason.html][A category-theoretic view of inductive reasoning]]
    6.18 @@ -18,6 +23,27 @@
    6.19    - [[../cortex/html/ai-journal-review.html][Interesting Articles from /Artificial Intelligence/]]
    6.20  
    6.21  ** Cortex: a virtual world for sensate AI 
    6.22 +<<<<<<< local
    6.23 +1. [[../cortex/html/intro.html][Intro: Choosing between Virtual and Real Time]]
    6.24 +2. [[../cortex/html/setup.html][Installing jMonkeyEngine3, a 3D Game Engine]]
    6.25 +3. [[../cortex/html/world.html][Creating a Virtual World]]
    6.26 +4. [[../cortex/html/util.html][Utilities that Integrate jMonkeyEngine3 into Clojure ]]
    6.27 +5. [[../cortex/html/games.html][ Showing off: Games and Examples]]
    6.28 +6. *Sensors and effectors*
    6.29 +   1. [[../cortex/html/sense.html][Preamble: auxillary functions]]
    6.30 +   2. [[../cortex/html/body.html][Building a Body]]
    6.31 +   3. [[../cortex/html/vision.html][Vision]]
    6.32 +   4. [[../cortex/html/hearing.html][Hearing]]
    6.33 +   5. [[../cortex/html/touch.html][Touch]]
    6.34 +   6. [[../cortex/html/proprioception.html][Proprioception]]
    6.35 +   7. [[../cortex/html/movement.html][Movement]]
    6.36 +   8. [[../cortex/html/integration.html][Integration]]
    6.37 +7. [[../cortex/html/gabor.html][Gabor Filters]]
    6.38 +
    6.39 +** Quantitative design
    6.40 +- [[../dylan/resolution.svg][Display resolutions, simplified.]] Intended to become a replacement
    6.41 +  for [[http://en.wikipedia.org/wiki/File:Vector_Video_Standards4.svg][this Wikipedia graphic]].
    6.42 +=======
    6.43    1. [[../cortex/html/intro.html][Intro: Choosing between Virtual and Real Time]]
    6.44    2. [[../cortex/html/setup.html][Installing jMonkeyEngine3, a 3D Game Engine]]
    6.45    3. [[../cortex/html/world.html][Creating a Virtual World]]
    6.46 @@ -34,6 +60,7 @@
    6.47       8. [[../cortex/html/integration.html][Integration]]
    6.48    7. [[../cortex/html/gabor.html][Gabor Filters]]
    6.49    
    6.50 +>>>>>>> other
    6.51  ** Pok\eacute{}mon
    6.52    - [[../pokemon-types/html/types.html][Best-first search for effective Pok\eacute{}mon types]]
    6.53    - [[../pokemon-types/html/lpsolve.html][Discovering effective Pok\eacute{}mon types using linear optimization.]]
    6.54 @@ -43,9 +70,16 @@
    6.55    - [[./vba-clojure/html/total-control.html][Pok\eacute{}mon Yellow Total Control Hack]]
    6.56  
    6.57  ** Thoughts
    6.58 +<<<<<<< local
    6.59 +- [[../dylan/html/science.html][Science Minus Science]]
    6.60 +- [[../thoughts/html/man-years.html][A Universe of Human Experience]]
    6.61 +- [[../thoughts/html/emacs-password.html][Emacs Password Security]]
    6.62 +- [[../server/html/server.html][The Server Culture]]
    6.63 +- [[../thoughts/html/patents.html][Thoughts on Patents]]
    6.64 +=======
    6.65    - [[../dylan/html/science.html][Science Minus Science]]
    6.66    - [[../thoughts/html/man-years.html][A Universe of Human Experience]]
    6.67    - [[../thoughts/html/emacs-password.html][Emacs Password Security]]
    6.68    - [[../server/html/server.html][The Server Culture]]
    6.69    - [[../thoughts/html/patents.html][Thoughts on Patents]]
    6.70 -  - [[../thoughts/html/ideas.html][Ideas]]
    6.71 \ No newline at end of file
    6.72 +  - [[../thoughts/html/ideas.html][Ideas]]>>>>>>> other

     7.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.2 +++ b/org/index.org.orig	Sat Jul 13 08:03:56 2013 +0100
     7.3 @@ -0,0 +1,52 @@
     7.4 +#+title: Our Blog Entries
     7.5 +#+author: Robert McIntyre & Dylan Holmes
     7.6 +#+email: rlm@mit.edu
     7.7 +#+description: A Blog on AI, quantum mechanics, philosophy, and all sorts of coding goodies in clojure, java, C and more!
     7.8 +#+keywords: AI, clojure, quantum mechanics 
     7.9 +#+SETUPFILE: ../../aurellem/org/setup.org
    7.10 +#+INCLUDE: ../../aurellem/org/level-0.org
    7.11 +#+OPTIONS: toc:nil, num:nil
    7.12 +
    7.13 +** Adventures in coding
    7.14 +- [[../abomination/html/no_parens.html][Calling it quits without parentheses]]
    7.15 +- [[../cortex/html/capture-video.html][Capture live video feeds from JMonkeyEngine]]
    7.16 +** Academic
    7.17 +- [[../dylan/html/quandary.html][Bugs in quantum mechanics]]
    7.18 +- [[../dylan/html/visualizing-reason.html][A category-theoretic view of inductive reasoning]]
    7.19 +- [[../jaynes/html/stat-mech.html][Jaynes' /Statistical Mechanics/]]
    7.20 +- [[../cortex/html/ai-journal-review.html][Interesting Articles from /Artificial Intelligence/]]
    7.21 +
    7.22 +** Cortex: a virtual world for sensate AI 
    7.23 +1. [[../cortex/html/intro.html][Intro: Choosing between Virtual and Real Time]]
    7.24 +2. [[../cortex/html/setup.html][Installing jMonkeyEngine3, a 3D Game Engine]]
    7.25 +3. [[../cortex/html/world.html][Creating a Virtual World]]
    7.26 +4. [[../cortex/html/util.html][Utilities that Integrate jMonkeyEngine3 into Clojure ]]
    7.27 +5. [[../cortex/html/games.html][ Showing off: Games and Examples]]
    7.28 +6. *Sensors and effectors*
    7.29 +   1. [[../cortex/html/sense.html][Preamble: auxillary functions]]
    7.30 +   2. [[../cortex/html/body.html][Building a Body]]
    7.31 +   3. [[../cortex/html/vision.html][Vision]]
    7.32 +   4. [[../cortex/html/hearing.html][Hearing]]
    7.33 +   5. [[../cortex/html/touch.html][Touch]]
    7.34 +   6. [[../cortex/html/proprioception.html][Proprioception]]
    7.35 +   7. [[../cortex/html/movement.html][Movement]]
    7.36 +   8. [[../cortex/html/integration.html][Integration]]
    7.37 +7. [[../cortex/html/gabor.html][Gabor Filters]]
    7.38 +
    7.39 +** Quantitative design
    7.40 +- [[../dylan/resolution.svg][Display resolutions, simplified.]] Intended to become a replacement
    7.41 +  for [[http://en.wikipedia.org/wiki/File:Vector_Video_Standards4.svg][this Wikipedia graphic]].
    7.42 +** Pok\eacute{}mon
    7.43 +  - [[../pokemon-types/html/types.html][Best-first search for effective Pok\eacute{}mon types]]
    7.44 +  - [[../pokemon-types/html/lpsolve.html][Discovering effective Pok\eacute{}mon types using linear optimization.]]
    7.45 +  - [[../vba-clojure/html/rom.html][Notes on deconstructing Pok\eacute{}mon Yellow]]
    7.46 +  - [[http://web.mit.edu/dxh/www/guess/][9 Questions with Pok\eacute{}mon]] (watch this space!)
    7.47 +    - [[http://aurellem.org/pokeclass/html/idtree.html][How /9 Questions with Pok\eacute{}mon/ was made.]] (in progress)
    7.48 +  - [[./vba-clojure/html/total-control.html][Pok\eacute{}mon Yellow Total Control Hack]]
    7.49 +
    7.50 +** Thoughts
    7.51 +- [[../dylan/html/science.html][Science Minus Science]]
    7.52 +- [[../thoughts/html/man-years.html][A Universe of Human Experience]]
    7.53 +- [[../thoughts/html/emacs-password.html][Emacs Password Security]]
    7.54 +- [[../server/html/server.html][The Server Culture]]
    7.55 +- [[../thoughts/html/patents.html][Thoughts on Patents]]