initial merge with github files