Updated process artist styles pages and added parlors html
Removed merge conflicts in artist implemented gallery and portfolio