started seperating inline script and styling
resolving merge stuff, didn't see Quin's commits