ChangeLog
gitignore
Haml
Css _Js BootStrap
views settings
merge