New database with fields
Merge branch 'gn-phase-2'
changes to index
Resolved conflict on index

Conflicts:
	wp-content/themes/dream/index.php
Front end design of homepage
basic pseudorandom placement logic
Merge branch 'master' into gn-phase-2
Merge branch 'gn-phase-2'
fixed conflict on index
minor changes to the presentation
Merge branch 'frontend-init'
global "post"
Merge branch 'master' into frontend-init
Merge branch 'master' into gn-phase-2
Merge branch 'frontend-init'
Image changes to wp-uploads
Merge branch 'master' into gn-phase-2
Image size changes
built a switch between FIX and RAND
Merge branch 'master' into frontend-init