Changed grunt server port to 3000
Almost completed income & expenses chart
File renaming