No More .idea
1/16/14 - Another change to the readme
Testing
remove .idea
Deleted .idea
yet another change to README
Merge pull request #3 from adambeee/master

Change to README yet again
initial commit after forking...
added a Rubymine change in README
1/17/14 4AM, no more foundation, added bootstrap again, alot more stable. re-adding styles.
1-17-14 changed readme file and changed foundation to bootstrap to make it more stable
Working more with stylesheets and custom CSS
Merge remote-tracking branch 'origin/masters' into masters

Conflicts:
	README
	app/assets/stylesheets/framework_and_overrides.css.scss
	app/views/layouts/_navigation.html.erb
	app/views/pages/home.html.erb