project show page
conflict
Merge branch 'master' into develop
styled proj index made proj show repsonsive and what else did we do> it donest  matter... - words of giacomo patella
resolve conflict
resolve conflict