Just a JSHint validation on the js files
Merge
Merge reset HEAD
removing conflicts
Merge pull request #1 from cstipkovic/master

Just a JSHint validation on the js files