commiting more stuff
Merge branch 'master' of https://github.com/entaria/Entaria.git