Merge pull request #2 from TheNextMillionDollarIdea/master

Merging tabs
Merge pull request #11 from rmilosic/master

Merge pull request #2 from TheNextMillionDollarIdea/master