Add extra !
added a paragraph to the view
Add h2 changes
Merge branch 'working' of github.com:WizardNinja89/chartify into working

Conflicts:
	app/views/main/index.html.erb
merged changes on index
Add change
merged changes
Add second change
Add Second change
Clean up changes
Change from working_alex branch
Change from working
Change
user now gets asked for the permissions we need to get their data
Merge branch 'working' of https://github.com/WizardNinja89/chartify into working
Added sidebar, styling, login page, fb permissions
Merge pull request #6 from WizardNinja89/working

Working