Commiting for pull
Merging both "masters"
Merged master branches and Refined some code