added some stuff
Adding more stuff
Added some conflict for our merge
Merge fixed
Merge pull request #1 from RzhanRichardZhan/richard

added some stuff