adding accidently deleted content
stashing changes
getting flex back to display table
stashing changes
bower changes, gitignore update for node modules
finally getting back to zero
changes for media queries below 767px
merging
fixing conflicts