fixed
fixed merge
Fixed javascript! More readable!
fixig stuff
Merge branch 'Interface' of github.com:Plazr/plazr into Interface
working on prices
merged