Merge branch 'master' of https://github.com/sahan756/Formulaic

Conflicts:
	src/fomulaic/MainFrame.java
new commit