first commit
Merge branch 'master' of https://github.com/pmccaughtry/angularjs-flotcharts

Conflicts:
	app/js/controllers/charts.js
first commit
first commit