Forced commit of something that I didn't do
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Add neat featured component
Merge remote-tracking branch 'origin/master'