REmoved misc files
Merge branches