commit
merged patrick
merged patrick10
added info bar