add alot
merged
merge simida
Merge pull request #4 from ryaninhust/master

hi ma n