Merge pull request #23 from Traction-Creative-Services/development

Development
Merge pull request #24 from Traction-Creative-Services/development

gg bro.
Merge pull request #25 from Traction-Creative-Services/development

Login Page Update
Merge pull request #28 from Traction-Creative-Services/frontend

Frontend
Revert "Frontend"
Merge pull request #29 from Traction-Creative-Services/revert-28-frontend

Revert "Frontend"
Resolve version conflicts (ms)
Merge branch 'development'
Resolve bugs created in merge
Update main.js
Update main.js
Update main.js