small changes made before pulling
Merge branch 'frontend'
Small amounts of front-end done
Merge branch 'master' of github.com:mbiokyle29/ideaMachine
Merge branch 'master' into frontend
front-end worked(?)
moved everything into public
finnally fixed locations for static files, idea template, idea not render for null record