first commit
new haml file added
Merge remote-tracking branch 'origin/master'
new file added last
iman has modified