dynamic beats
fixed conflicts
lotsa things
Merge pull request #3 from wannabefro/amanda

Amanda