Merge commit '6b7e384ec6dd0fec528b35112ce111b2775cfb46'
Merge commit '758d6fdff525c9d4754ebce6774d05de892e1888'
Merge commit '463ef5b5fc0675bd13feeee52764998fc6b73225'
Merge commit '8bfaf296957e18b49ae9f5b1cee0a231a8dab806'
Merge commit 'b5d7b9cb9585351ee280eea7be1f9b7603251fef'
Merge commit '4718bd927ee5946df8d7e927e0120b3717832748'
Merge commit '2579af732fc41ed65966d75e539d1f2ce9d98a53'
Merge commit 'a783d0a6abcfff6c8bcb5ce675aa1c5d83369126'
Merge commit '87c8059307571bbb1e0aebc26b0687f253bbe70d'
Merge commit '8488b922002d0d5c6e2a41241a9909ecfda66b4f'
Merge commit 'c9bedad4970aafeeae924d62b7c0b5084fb60d80'
???
Merge commit '3cbb5bac55b8d0c7bb740e8e74f12f7920ab78df'
Merge commit '09f0166da83518173853da29816983e37ad59ea3'
Merge commit '27bf6813300a10069ea08688f323a1cc64982de1'
Merge commit 'dcdb0df4ac90cbf6b4fc74f4edd8938afce7c35f'
Merge commit '11262970d96c7024a27509eab5f3cfbfc7f56e93'
Merge pull request #204 from will123195/master

prevent duplicate css files from causing issues
add and order by to the databasefolders
Merge pull request #205 from joshh/master

add order by to database folders