Rectify static folder
TDD
Backend functions
Removed DS_STORE
Merged with master