Use strftime method for formatting date
Add .DS_Store files to .gitignore file
Use rails 4.1.5
Merge branch 'master' of https://github.com/keri4/flatstack-task-2