Merge pull request #1 from Aloalo/master

jdgfjfgdj
bug fixin

project properties file
fadsg
fagsag
hhsdfhfds
Merge pull request #1 from toi333/master

qwe