Horray this happened!

	modified:   index.php
Testing to see if I can commit a change using git
	modified:   index.php
added quick-reload plugin and album template with a button for creating album pages
album creation almost done
dropped imageURL from Albums and changed sql queries to match
album creation from search and albums by artist page "complete"

	modified:   album-template.tpl
	new file:   api/albumsByArtist.php
	modified:   api/index.php
	modified:   api/music-engine.php
	modified:   artist.php
	modified:   css/style.css
	modified:   header.php
merging test commit
	modified:   api/music-engine.php
merger!

	modified:   album-create.tpl
	modified:   artist.php