fixed history, refactored discount
Merge branch 'dev' of github.com:lvl0nax/topaza into dev
added picture to categories + home
Merge branch 'dev' of github.com:lvl0nax/topaza into dev
Merge branch 'dev' into main_page
main_page was created and i hope you will not be beat me
added picture to categories, refactor main_page
Merge pull request #20 from Neodelf/main_page

Main page
Merge pull request #21 from lvl0nax/master

Master