pull
Merge branch 'master' of https://github.com/Swquenzer/acid_rain.git
sync
Revert "pull"

This reverts commit 7d8f94028ad132070c80cb78086814049c22d0bf.
Merge branch 'master' of https://github.com/Swquenzer/acid_rain
pull
Merge branch 'master' of https://github.com/Swquenzer/acid_rain.git
modified the loger output to be more readable, added stored query insertion, filling functions for add inventory
Merge branch 'master' of https://github.com/Swquenzer/acid_rain

Conflicts:
	Function/log.log
	Function/logger.php