Added Artist wizard
Deleted merge conflict files
Fixed color changing javascript on main login page
Added tests for Artist model
created methods on Artist model to create links for social media
Added tests and methods to artist model
Added social icons to artist pages
Added new view for artist/tattoos
removed _form because replaced with two separate forms
Added more comments to methods
removed artist_steps/photos view
Added jquery to auto resize modal size depending on window size
Changed text positioning on modal
Changed text positioning on modal
Removed extraneous _navigation file from previous commit
added partial for artist_steps
Uncommented sunspot search.
search method prep.
Merge branch 'master' of https://github.com/bytheway875/HashTat
Photo swap on home and tattoo.