App works , its not pretty, but it works
Merge remote-tracking branch 'github/master'