added relic 35
fixed Relic35
fixed ignores
change that will cause conflict (variable)
created conflict
created conflict 2
conflict generating..
merged conflict to mine
Added Butterknife + created stub for relics Around
Merge branch 'feature_new_models'