front-end framework complete and working
Merge branch 'master' of heroku.com:ctrl-f
added .gitignore
update .gitignore