gitignore
phase 6d fixed

thickness of text in buttons fixed
erik's merge