Merge pull request #40 from otherwhitefrank/fdye_2

Fdye 2
Merge pull request #41 from otherwhitefrank/fdye_2

Remove .idea from git
Fixed front-end bugs