Merge branch 'Jake'
Merge pull request #3 from jaruesink/Jake

deleted test
Merge pull request #4 from jaruesink/Wesley

Merge pull request #2 from jaruesink/master
Started mobile menu and home page

Adjusted index.html, main.css, script.js added home.html, menu.css
Merge pull request #5 from jaruesink/Devan

Started mobile menu and home page
Merge branch 'Jake'
Merge branch 'master' of https://github.com/jaruesink/SMART
Merging
Updated home.html

Formatted home.html in main.css
blah
go
Additional Formatting to home and menu
added js files
Update 12:43 am

Added adding goal page
Merge branch 'Devan'

Conflicts:
	js/smart/config/routes.rb
	smart/Gemfile.lock
	smart/app/views/statuses/index.html.erb
	smart/db/schema.rb
Merge remote-tracking branch 'origin/Derek'

Conflicts:
	smart/Gemfile.lock
	smart/app/views/statuses/index.html.erb
	smart/db/schema.rb
Merge remote-tracking branch 'origin/Wesley'
Merge branch 'master' into Jake