add lolcommits
Ignore ruby version
Merge master into frontend and resolve conflicts