Merge pull request #1 from arjungopisetty/master

Basic Formatting
Merge pull request #2 from arjungopisetty/master

Formatting 2.0
Merge pull request #1 from pikazu/master

lolwat