Submitting code for basic changes
Merge branches 'master' and 'master' of http://github.com/Hackstore/hackstore