Initial commit
initial commit
Merge branch 'master' of https://github.com/rssTeamPractice/project2
Removed index.html from public
first development push, removing public/index.html
preparing database in development
Merge branch 'development'
added haml set up
merged conflicted files based on add_haml branch
Merge branch 'development'