nothing
resolved merge conflicts
mereg conflicts
fixed slider tabs on DB index and adjusted footer text size
nothing
fixed merge conflicts
Merge pull request #61 from earthspiritart/master

fixed slider tabs on DB index and adjusted footer text size
took out html
added an end to a form
fixed other issues