Merge branch 'master' of fozzie:projects/homepage

This commit is contained in:
Neale Pickett 2013-01-17 17:11:07 -07:00
commit eb2b445237
3 changed files with 8 additions and 2 deletions

View File

@ -31,6 +31,11 @@ img {
max-width: 60%; max-width: 60%;
} }
img.right {
margin: 1em;
float: right;
}
pre { pre {
background: #ccc; background: #ccc;
} }

View File

@ -1,5 +1,7 @@
Title: DJ Service Title: DJ Service
<img alt="2012 Halloween Party Photo" src="images/dj-setup.jpg" class="right">
I run audio for the [Los Alamos Derby Dames](http://laderbydames.com/) at I run audio for the [Los Alamos Derby Dames](http://laderbydames.com/) at
their bouts and parties. I have also, since 2008, run sound for various their bouts and parties. I have also, since 2008, run sound for various
[computing-related contests](http://dirtbags.net/ctf/). [computing-related contests](http://dirtbags.net/ctf/).
@ -22,8 +24,6 @@ My mobile DJ setup includes:
* Ability to play and mix music from any portable device (iPod, phone, etc.) * Ability to play and mix music from any portable device (iPod, phone, etc.)
* Microphones: wired and wireless * Microphones: wired and wireless
![Photo from 2012 Halloween Party](images/dj-setup.jpg)
I play using a Stanton SCS.3 with [Mixxx](http://www.mixxx.org/): I am also I play using a Stanton SCS.3 with [Mixxx](http://www.mixxx.org/): I am also
a code contributor to Mixxx. a code contributor to Mixxx.

1
src/pysieved/index.mdwn Symbolic link
View File

@ -0,0 +1 @@
../pysieved.mdwn