NetBeans begone!
Removed shit
Merge remote-tracking branch 'origin/master' into test2

Conflicts:
	app/views/static_pages/home.html.erb
Windows support
yep
Merge remote-tracking branch 'origin/master' into test2
Jeep
The final
removed tommis gemfile
css tweaks