Merge pull request #11 from MayaLekova/master

Please bite my shiny metal a$$!
merged from central repo
Merge pull request #12 from MayaLekova/master

Changes from Linh; Improvements for small resolution
remove redundant js file, alerts in main.js
fixes
Remove master keys
merged from alehander42
added tags info