Updated Git Ignore
Updated gitignore
Merge pull request #3 from sherakama/7.x-1.x

7.x 1.x
Removing line comments from config.rb defaults

Signed-off-by: bmx269 <trent@smallrobot.org>
Updated panels grids and add grid proportion mixin
Merge pull request #4 from johannez/7.x-1.x

Updated panels grids and add grid proportion mixin
Remove NEWTHEME residual from Mothership base theme, Update the README with info on renaming in template.php
Updated Font Awesome to 3.0.2
Added 4 column panel layout
Merge pull request #6 from DannyJoris/4column-panel

Added 4 column panel layout
Merge pull request #5 from DannyJoris/font-awesome-update

Updated Font Awesome to 3.0.2
Added 2 two column layouts: 25-75 & 75-25
fix classes
Adding panel Menu library, removing bootstrap JS files, adding panels base page template, updating panels templates
Merge branch '7.x-1.x' of github.com:bmx269/parrot into 7.x-1.x
inline-block fixes, additional panels layouts wrapper templates.
update read me with more details.
Fixed missing container div.
Update to use Compass Reset
Add EM conversion option to breakpoint declaration